emu-mirror/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-03-13 17:22:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced references to games with references to applications

Browse Source
This commit is contained in:
OpenSauce04 2025-03-01 00:08:08 +00:00 committed by OpenSauce
parent 75bed895cf
commit 9ad314c5f7
29 changed files with 83 additions and 79 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/SettingsFragmentPresenter.kt
View File

@ -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<SettingsItem>()
if (menuTag == null) {

8
src/android/app/src/main/res/layout/dialog_about_game.xml
View File

@ -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" />
<TextView
android:id="@+id/about_game_company"
@ -56,7 +56,7 @@
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@id/about_game_filename"
app:layout_constraintTop_toBottomOf="@+id/about_game_title"
tools:text="Game Company" />
tools:text="Company" />
<TextView
android:id="@+id/about_game_region"
@ -65,7 +65,7 @@
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@id/about_game_title"
app:layout_constraintTop_toBottomOf="@+id/about_game_company"
tools:text="Game Region" />
tools:text="Application Region" />
<TextView
android:id="@+id/about_game_id"
@ -83,7 +83,7 @@
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@id/about_game_title"
app:layout_constraintTop_toBottomOf="@+id/about_game_id"
tools:text="Game Filename" />
tools:text="Application Filename" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -3,21 +3,21 @@
<!-- General application strings -->
<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_disclaimer">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:\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>
<string name="app_game_install_description">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.</string>
<!-- Home Strings -->
<string name="grid_menu_core_settings">Settings</string>
<string name="home_options">Options</string>
<string name="home_search">Search</string>
<string name="home_games">Games</string>
<string name="home_games">Applications</string>
<string name="settings_description">Configure emulator settings</string>
<string name="install_game_content">Install CIA file</string>
<string name="install_game_content_description">Install games, updates or DLC</string>
<string name="install_game_content_description">Install applications, updates or DLC</string>
<string name="share_log">Share Log</string>
<string name="share_log_description">Share Azahar\'s log file to debug issues</string>
<string name="gpu_driver_manager">GPU Driver Manager</string>
@ -27,13 +27,13 @@
<string name="custom_driver_not_supported">Custom drivers not supported</string>
<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 Azahar to populate the games list</string>
<string name="select_games_folder">Select Applications Folder</string>
<string name="select_games_folder_description">Allows Azahar to populate the application 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 Azahar uses to load games</string>
<string name="games_dir_selected">Application directory selected</string>
<string name="select_citra_user_folder_home_description">Changes the files that Azahar uses to load applications</string>
<string name="theme_and_color_description">Modify the look of the app</string>
<string name="install_cia_title">Install CIA</string>
@ -65,12 +65,12 @@
<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>
<string name="games_description">Select your &lt;b>Games&lt;/b> folder with the button below.</string>
<string name="games">Applications</string>
<string name="games_description">Select your &lt;b>Applications&lt;/b> folder with the button below.</string>
<string name="done">Done</string>
<string name="done_description">You\'re all set.\nEnjoy your games!</string>
<string name="done_description">You\'re all set.\nEnjoy using the emulator!</string>
<string name="text_continue">Continue</string>
<string name="add_games">Add Games</string>
<string name="add_games">Add Applications</string>
<string name="notifications">Notifications</string>
<string name="notifications_description">Grant the notification permission with the button below.</string>
<string name="give_permission">Grant permission</string>
@ -81,8 +81,8 @@
<string name="microphone_permission">Microphone</string>
<string name="microphone_permission_description">Grant the microphone permission below to emulate the 3DS microphone.</string>
<string name="permission_denied">Permission denied</string>
<string name="add_games_warning">Skip selecting games folder?</string>
<string name="add_games_warning_description">Games won\'t be displayed in the Games list if a folder isn\'t selected.</string>
<string name="add_games_warning">Skip selecting applications folder?</string>
<string name="add_games_warning_description">Software won\'t be displayed in the Applications list if a folder isn\'t selected.</string>
<string name="add_games_warning_help" translatable="false">https://web.archive.org/web/20240304210021/https://citra-emu.org/wiki/dumping-game-cartridges/</string>
<string name="warning_help">Help</string>
<string name="warning_skip">Skip</string>
@ -98,8 +98,8 @@
<string name="setup_set_theme">Set Theme</string>
<!-- Search Strings -->
<string name="search_and_filter_games">Search and Filter Games</string>
<string name="home_search_games">Search Games</string>
<string name="search_and_filter_games">Search and Filter Applications</string>
<string name="home_search_games">Search Applications</string>
<string name="search_recently_played">Recently Played</string>
<string name="search_recently_added">Recently Added</string>
<string name="search_installed">Installed</string>
@ -152,7 +152,7 @@
<string name="start">Start</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="show_home_apps">Show HOME menu apps in Applications list</string>
<string name="run_system_setup">Run System Setup when the HOME Menu is launched</string>
<string name="system_type_minimal">Minimal</string>
<string name="system_type_old_3ds">Old 3DS</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 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>
<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 applications, save states, and the Applications 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>
@ -198,10 +198,10 @@
<string name="steps_per_hour_description">Number of steps per hour reported by the pedometer. Range from 0 to 65,535.</string>
<string name="console_id">Console ID</string>
<string name="regenerate_console_id">Regenerate Console ID</string>
<string name="regenerate_console_id_description">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?</string>
<string name="regenerate_console_id_description">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?</string>
<string name="plugin_loader">3GX Plugin Loader</string>
<string name="plugin_loader_description">Loads 3GX plugins from the emulated SD card if they are available.</string>
<string name="allow_plugin_loader">Allow Games to Change Plugin Loader State</string>
<string name="allow_plugin_loader">Allow Applications to Change Plugin Loader State</string>
<string name="allow_plugin_loader_description">Allows homebrew apps to enable the plugin loader even when it is disabled.</string>
<!-- Camera settings strings -->
@ -231,7 +231,7 @@
<string name="linear_filtering">Linear Filtering</string>
<string name="linear_filtering_description">Enables linear filtering, which causes game visuals to appear smoother.</string>
<string name="texture_filter_name">Texture Filter</string>
<string name="texture_filter_description">Enhances the visuals of games by applying a filter to textures. The supported filters are Anime4K Ultrafast, Bicubic, ScaleForce, xBRZ freescale, and MMPX.</string>
<string name="texture_filter_description">Enhances the visuals of applications by applying a filter to textures. The supported filters are Anime4K Ultrafast, Bicubic, ScaleForce, xBRZ freescale, and MMPX.</string>
<string name="hw_shaders">Enable Hardware Shader</string>
<string name="hw_shaders_description">Uses hardware to emulate 3DS shaders. When enabled, game performance will be significantly improved.</string>
<string name="shaders_accurate_mul">Accurate Multiplication</string>
@ -243,7 +243,7 @@
<string name="frame_limit_slider">Limit Speed Percent</string>
<string name="frame_limit_slider_description">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.</string>
<string name="internal_resolution">Internal Resolution</string>
<string name="internal_resolution_description">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.</string>
<string name="internal_resolution_description">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.</string>
<string name="internal_resolution_setting_1x">Native (400x240)</string>
<string name="internal_resolution_setting_2x">2x Native (800x480)</string>
<string name="internal_resolution_setting_3x">3x Native (1200x720)</string>
@ -767,7 +767,7 @@
<string name="artic_base_connect">Connect to Artic Base</string>
<string name="artic_base_enter_address">Enter Artic Base server address</string>
<string name="delay_render_thread">Delay game render thread</string>
<string name="delay_render_thread_description">Delay the game render thread when it submits data to the GPU. Helps with performance issues in the (very few) dynamic-fps games.</string>
<string name="delay_render_thread_description">Delay the game render thread when it submits data to the GPU. Helps with performance issues in the (very few) applications with dynamic framerates.</string>
<!-- Quickload&Save-->
<string name="emulation_quicksave_slot">Quicksave</string>
@ -783,6 +783,6 @@
<string name="instant_debug_log">Flush log output on every message</string>
<string name="instant_debug_log_desc">Immediately commits the debug log to file. Use this if citra crashes and the log output is being cut.</string>
<string name="disable_right_eye_render">Disable Right Eye Render</string>
<string name="disable_right_eye_render_desc">Greatly improves performance in some games, but can cause flickering in others.</string>
<string name="disable_right_eye_render_desc">Greatly improves performance in some applications, but can cause flickering in others.</string>
</resources>

9
src/audio_core/hle/source.cpp
View File

@ -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<s32>(config.length) < 0) {
LOG_ERROR(Audio_DSP,
"Skipping embedded buffer sample! Game passed in improper value for length. "
"addr {:X} length {:X}",
static_cast<u32>(config.physical_address), static_cast<u32>(config.length));
LOG_ERROR(
Audio_DSP,
"Skipping embedded buffer sample! Application passed in improper value for length. "
"addr {:X} length {:X}",
static_cast<u32>(config.physical_address), static_cast<u32>(config.length));
} else {
state.input_queue.emplace(Buffer{
config.physical_address,

3
src/citra_qt/citra_qt.cpp
View File

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

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

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

2
src/citra_qt/configuration/configure_audio.ui
View File

@ -98,7 +98,7 @@
<item>
<widget class="QCheckBox" name="toggle_realtime_audio">
<property name="toolTip">
<string>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.</string>
<string>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.</string>
</property>
<property name="text">
<string>Enable realtime audio</string>

4
src/citra_qt/configuration/configure_debug.ui
View File

@ -178,7 +178,7 @@
<item>
<widget class="QSlider" name="slider_clock_speed">
<property name="toolTip">
<string>&lt;html&gt;&lt;body&gt;Changes the emulated CPU clock frequency.&lt;br&gt;Underclocking can increase performance but may cause the game to freeze.&lt;br&gt;Overclocking may reduce in game lag but also might cause freezes&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;body&gt;Changes the emulated CPU clock frequency.&lt;br&gt;Underclocking can increase performance but may cause the application to freeze.&lt;br&gt;Overclocking may reduce application lag but also might cause freezes&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="minimum">
<number>0</number>
@ -265,7 +265,7 @@
<item>
<widget class="QLabel" name="label_cpu_clock_info">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;CPU Clock Speed Information&lt;br/&gt;Underclocking can increase performance but may cause the game to freeze.&lt;br/&gt;Overclocking may reduce in game lag but also might cause freezes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;CPU Clock Speed Information&lt;br/&gt;Underclocking can increase performance but may cause the application to freeze.&lt;br/&gt;Overclocking may reduce lag in applications but also might cause freezes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>

4
src/citra_qt/configuration/configure_enhancements.ui
View File

@ -316,7 +316,7 @@
<string>Disable Right Eye Rendering</string>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Disable Right Eye Rendering&lt;/p&gt;&lt;p&gt;Disables rendering the right eye image when not using stereoscopic mode. Greatly improves performance in some games, but can cause flickering in others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Disable Right Eye Rendering&lt;/p&gt;&lt;p&gt;Disables rendering the right eye image when not using stereoscopic mode. Greatly improves performance in some applications, but can cause flickering in others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@ -352,7 +352,7 @@
<item row="1" column="1">
<widget class="QCheckBox" name="toggle_preload_textures">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load all custom textures into memory on boot, instead of loading them when the game requires them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load all custom textures into memory on boot, instead of loading them when the application requires them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Preload Custom Textures</string>

14
src/citra_qt/configuration/configure_graphics.ui
View File

@ -188,7 +188,7 @@
<item>
<widget class="QCheckBox" name="toggle_accurate_mul">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Correctly handle all edge cases in multiplication operation in shaders. &lt;/p&gt;&lt;p&gt;Some games requires this to be enabled for the hardware shader to render properly.&lt;/p&gt;&lt;p&gt;However this would reduce performance in most games.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Correctly handle all edge cases in multiplication operation in shaders. &lt;/p&gt;&lt;p&gt;Some applications requires this to be enabled for the hardware shader to render properly.&lt;/p&gt;&lt;p&gt;However this would reduce performance in most applications.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Accurate Multiplication</string>
@ -224,7 +224,7 @@
<item>
<widget class="QCheckBox" name="toggle_async_present">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Perform presentation on separate threads. Improves performance when using Vulkan in most games.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Perform presentation on separate threads. Improves performance when using Vulkan in most applications.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Enable Async Presentation</string>
@ -258,7 +258,7 @@
<item>
<widget class="QLabel" name="texture_sampling_label">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Texture Sampling</string>
@ -269,7 +269,7 @@
<widget class="QComboBox" name="texture_sampling_combobox">
<item>
<property name="text">
<string>Game Controlled</string>
<string>Application Controlled</string>
</property>
</item>
<item>
@ -331,7 +331,7 @@
</item>
<item>
<property name="text">
<string>Use per-game</string>
<string>Use per-application</string>
</property>
</item>
</widget>
@ -339,10 +339,10 @@
<item>
<widget class="QLabel" name="label_delay_render">
<property name="text">
<string>Delay game render thread:</string>
<string>Delay application render thread:</string>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Delays the emulated game render thread the specified amount of milliseconds every time it submits render commands to the GPU.&lt;/p&gt;&lt;p&gt;Adjust this feature in the (very few) dynamic-fps games to fix performance issues.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Delays the emulated application render thread the specified amount of milliseconds every time it submits render commands to the GPU.&lt;/p&gt;&lt;p&gt;Adjust this feature in the (very few) dynamic framerate applications to fix performance issues.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>

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

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

2
src/citra_qt/configuration/configure_per_game.ui
View File

@ -180,7 +180,7 @@
<item>
<widget class="QPushButton" name="button_reset_per_game">
<property name="text">
<string>Reset Game Settings</string>
<string>Reset Per-Application Settings</string>
</property>
</widget>
</item>

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

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

4
src/citra_qt/configuration/configure_system.ui
View File

@ -471,7 +471,7 @@
<item row="17" column="1">
<widget class="QCheckBox" name="allow_plugin_loader">
<property name="text">
<string>Allow games to change plugin loader state</string>
<string>Allow applications to change plugin loader state</string>
</property>
</widget>
</item>
@ -721,7 +721,7 @@
<item>
<widget class="QLabel" name="label_disable_info">
<property name="text">
<string>System settings are available only when game is not running.</string>
<string>System settings are available only when applications is not running.</string>
</property>
<property name="wordWrap">
<bool>true</bool>

2
src/citra_qt/configuration/configure_ui.ui
View File

@ -68,7 +68,7 @@
<item>
<widget class="QGroupBox" name="game_list_groupBox">
<property name="title">
<string>Game List</string>
<string>Application List</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>

2
src/citra_qt/configuration/configure_web.ui
View File

@ -23,7 +23,7 @@
<item>
<widget class="QCheckBox" name="toggle_discordrpc">
<property name="text">
<string>Show Current Game in your Discord Status</string>
<string>Show current application in your Discord status</string>
</property>
</widget>
</item>

2
src/citra_qt/main.ui
View File

@ -446,7 +446,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Browse Public Application Lobby</string>
<string>Browse Public Rooms</string>
</property>
</action>
<action name="action_Start_Room">

4
src/citra_qt/movie/movie_play_dialog.cpp
View File

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

2
src/citra_qt/movie/movie_play_dialog.ui
View File

@ -54,7 +54,7 @@
<item row="0" column="0">
<widget class="QLabel">
<property name="text">
<string>Game:</string>
<string>Application:</string>
</property>
</widget>
</item>

4
src/citra_qt/movie/movie_record_dialog.cpp
View File

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

2
src/citra_qt/multiplayer/chat_room.cpp
View File

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

4
src/citra_qt/multiplayer/host_room.ui
View File

@ -48,7 +48,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Preferred Game</string>
<string>Preferred Application</string>
</property>
</widget>
</item>
@ -98,7 +98,7 @@
<enum>QLineEdit::PasswordEchoOnEdit</enum>
</property>
<property name="placeholderText">
<string>(Leave blank for open game)</string>
<string>(Leave blank for open room)</string>
</property>
</widget>
</item>

3
src/citra_qt/multiplayer/lobby.cpp
View File

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

2
src/citra_qt/multiplayer/lobby.ui
View File

@ -73,7 +73,7 @@
<item>
<widget class="QCheckBox" name="games_owned">
<property name="text">
<string>Games I Own</string>
<string>Applications I Own</string>
</property>
</widget>
</item>

4
src/citra_qt/multiplayer/lobby_p.h
View File

@ -253,9 +253,9 @@ public:
out.append(QStringLiteral("\n"));
const auto& m = member.value<LobbyMember>();
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;
}

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

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

11
src/citra_sdl/citra_sdl.cpp
View File

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

2
src/core/hle/service/frd/frd.h
View File

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

3
src/core/hle/service/nfc/nfc_device.cpp
View File

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