From 819d2a33c7f0c1a09043c57be6e4ea340b9668a8 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Thu, 15 Jun 2023 03:35:10 -0400 Subject: [PATCH 1/2] citra_android: Make strings more consistent --- .../app/src/main/res/values/strings.xml | 77 ++++++++++--------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 03c403ece..09085987b 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -7,7 +7,7 @@ Citra Citra Citra 3DS emulator notifications - Citra is running + Citra is Running Next, you will need to select a Game Folder. Citra will display all of the 3DS ROMs inside of the selected folder in the app.\n\nCIA ROMs, updates and DLC will need to be installed separately by clicking on the folder icon and selecting Install CIA. @@ -42,56 +42,57 @@ Theme will update when exiting Settings - Enable CPU JIT + CPU JIT Uses the Just-in-Time (JIT) compiler for CPU emulation. When enabled, game performance will be significantly improved. - System clock type + Clock Set the emulated 3DS clock to either reflect that of your device or start at a simulated date and time. - System clock starting time override - If the \"System clock type\" setting is set to \"Simulated clock\", this changes the fixed date and time to start at. - Emulated region - Emulated language - Enable 3GX Plugin Loader + Clock + Offset Time + If the clock is set to \"Simulated clock\", this changes the fixed date and time to start at. + Region + Language + 3GX Plugin Loader Loads 3GX plugins from the emulated SD if they are available. - Allow apps to change plugin loader state - Allow homebrew apps to enable the plugin loader even when it is disabled. + Allow Games to Change Plugin Loader State + Allows homebrew apps to enable the plugin loader even when it is disabled. Inner Camera Outer Left Camera Outer Right Camera - Image Source + Camera Image Source Sets the image source of the virtual camera. You can use an image file, or a device camera when supported. - Camera Device + Camera If the \"Image Source\" setting is set to \"Device Camera\", this sets the physical camera to use. Front Back External - Image Flip + Flip Renderer Graphics API - Enable debug renderer + Debug Renderer Log additional graphics related debug information. When enabled, game performance will be significantly reduced Enable V-Sync Synchronizes the game frame rate to the refresh rate of your device. - Enable linear filtering + 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, and xBRZ freescale. - Enable hardware shader + Enable Hardware Shader Uses hardware to emulate 3DS shaders. When enabled, game performance will be significantly improved. - Enable accurate shader multiplication + Accurate Multiplication Uses more accurate multiplication in hardware shaders, which may fix some graphical bugs. When enabled, performance will be reduced. Enable asynchronous GPU emulation Uses a separate thread to emulate the GPU asynchronously. When enabled, performance will be improved. - Enable limit speed + Limit Speed When enabled, emulation speed will be limited to a specified percentage of normal speed. - Limit speed percent + 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 + 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. Turning off this setting will significantly reduce emulation performance! For the best experience, it is recommended that you leave this setting enabled. Warning: Modifying these settings will slow emulation @@ -100,23 +101,23 @@ Depth Specifies the value of the 3D slider. This should be set to higher than 0% when Stereoscopic 3D is enabled. Cardboard VR - Cardboard Screen size + Cardboard Screen Size Scales the screen to a percentage of its original size. - Horizontal shift + Horizontal Shift Specifies the percentage of empty space to shift the screens horizontally. Positive values move the two eyes closer to the middle, while negative values move them away. - Vertical shift + Vertical Shift Specifies the percentage of empty space to shift the screens vertically. Positive values move the two eyes towards the bottom, while negative values move them towards the top. - Use shader JIT - Use disk shader cache + Shader JIT + Disk Shader Cache Reduce stuttering by storing and loading generated shaders to disk. It cannot be used without Enabling Hardware Shader. Utility - Dump textures + Dump Textures Dumps textures to dump/textures/[GAME ID] - Use custom textures + Custom Textures Uses custom textures found in load/textures/[GAME ID] - Preload custom textures + Preload Custom Textures Loads all custom textures into memory. This feature can use a lot of memory. - Async custom texture loading + Async Custom Texture Loading Loads custom textures in the background with worker threads to reduce loading stutter. Premium @@ -126,7 +127,7 @@ Thank you for your support! - Enable audio stretching + Audio Stretching Stretches audio to reduce stuttering. When enabled, increases audio latency and slightly reduces performance. Audio Input Device @@ -136,7 +137,7 @@ Saved settings Saved settings for %1$s Error saving %1$s.ini: %2$s - Loading... + Loading… Settings @@ -162,7 +163,7 @@ Debug - Your ROM is encrypted + Your ROM is Encrypted Invalid ROM format @@ -178,7 +179,7 @@ Toggle Controls Adjust Scale Relative Stick Center - Enable D-Pad Sliding + D-Pad Sliding Open Settings Open Cheats Landscape Screen Layout @@ -194,12 +195,12 @@ Amiibo Load Remove - Select Amiibo file - Error loading Amiibo + Select Amiibo File + Error Loading Amiibo While loading the specified Amiibo file, an error occurred. Please check that the file is correct. You need to allow write access to external storage for the emulator to work - Loading Settings... + Loading Settings… The external storage needs to be available in order to use Citra @@ -247,8 +248,8 @@ A fatal error occurred. Check the log for details.\nContinuing emulation may result in crashes and bugs. - Preparing shaders - Building shaders + Preparing Shaders + Building Shaders Cheats From 4d666b88b7acc13b748a2f717a1a267ab68b28d1 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Thu, 15 Jun 2023 03:35:30 -0400 Subject: [PATCH 2/2] citra_android: Add headers for clock and plugin loader --- .../features/settings/ui/SettingsFragmentPresenter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java index 05329bbd1..d791931b3 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java @@ -196,8 +196,12 @@ public final class SettingsFragmentPresenter { sl.add(new SingleChoiceSetting(SettingsFile.KEY_REGION_VALUE, Settings.SECTION_SYSTEM, R.string.emulated_region, 0, R.array.regionNames, R.array.regionValues, -1, region)); sl.add(new SingleChoiceSetting(SettingsFile.KEY_LANGUAGE, Settings.SECTION_SYSTEM, R.string.emulated_language, 0, R.array.languageNames, R.array.languageValues, 1, language)); + + sl.add(new HeaderSetting(null, null, R.string.clock, 0)); sl.add(new SingleChoiceSetting(SettingsFile.KEY_INIT_CLOCK, Settings.SECTION_SYSTEM, R.string.init_clock, R.string.init_clock_description, R.array.systemClockNames, R.array.systemClockValues, 0, systemClock)); sl.add(new DateTimeSetting(SettingsFile.KEY_INIT_TIME, Settings.SECTION_SYSTEM, R.string.init_time, R.string.init_time_description, "2000-01-01 00:00:01", dateTime)); + + sl.add(new HeaderSetting(null, null, R.string.plugin_loader, 0)); sl.add(new CheckBoxSetting(SettingsFile.KEY_PLUGIN_LOADER, Settings.SECTION_SYSTEM, R.string.plugin_loader, R.string.plugin_loader_description, false, pluginLoader)); sl.add(new CheckBoxSetting(SettingsFile.KEY_ALLOW_PLUGIN_LOADER, Settings.SECTION_SYSTEM, R.string.allow_plugin_loader, R.string.allow_plugin_loader_description, true, allowPluginLoader)); }