android: Restructure strings.xml

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -538,7 +538,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                 DateTimeSetting(
                     StringSetting.INIT_TIME,
                     R.string.simulated_clock,
-                    R.string.init_time_description,
+                    R.string.simulated_clock_description,
                     StringSetting.INIT_TIME.key,
                     StringSetting.INIT_TIME.defaultValue
                 )

src/android/app/src/main/res/values/strings.xml

@@ -9,10 +9,6 @@
     <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 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>
-    <string name="start">Start</string>
-    <string name="cancelling">Cancelling…</string>
-    <string name="important">Important</string>
-    <string name="dont_show_again">Don\'t show again</string>
 
     <!-- Home Strings -->
     <string name="grid_menu_core_settings">Settings</string>
@@ -175,20 +171,20 @@
     <string name="generic_buttons">Buttons</string>
     <string name="button">Button</string>
 
-    <!-- Core settings strings -->
-    <string name="cpu_jit">CPU JIT</string>
-    <string name="cpu_jit_description">Uses the Just-in-Time (JIT) compiler for CPU emulation. When enabled, game performance will be significantly improved.</string>
-    <string name="init_clock">Clock</string>
-    <string name="init_clock_description">Set the emulated 3DS clock to either reflect that of your device or start at a simulated date and time.</string>
-    <string name="cpu_clock_speed">CPU Clock Speed</string>
-
     <!-- System settings strings -->
+    <string name="emulation_settings">Emulation Settings</string>
     <string name="username">Username</string>
     <string name="new_3ds">New 3DS Mode</string>
     <string name="lle_applets">Use LLE Applets (if installed)</string>
+    <string name="enable_required_online_lle_modules">Enable required LLE modules for online features (if installed)</string>
+    <string name="enable_required_online_lle_modules_desc">Enables the LLE modules required for online multiplayer, eShop access, etc.</string>
     <string name="clock">Clock</string>
-    <string name="init_time">Offset Time</string>
+    <string name="init_clock">Clock</string>
-    <string name="init_time_description">If the clock is set to \"Simulated clock\", this changes the fixed date and time to start at.</string>
+    <string name="init_clock_description">Set the emulated 3DS clock to either reflect that of your device or start at a simulated date and time.</string>
+    <string name="device_clock">Device Clock</string>
+    <string name="simulated_clock">Simulated Clock</string>
+    <string name="simulated_clock_description">If the clock is set to \"Simulated clock\", this changes the fixed date and time to start at.</string>
+    <string name="profile_settings">Profile Settings</string>
     <string name="emulated_region">Region</string>
     <string name="emulated_language">Language</string>
     <string name="birthday">Birthday</string>
@@ -201,6 +197,9 @@
     <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 console ID with a new one. Your current virtual 3DS console ID 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="mac_address">MAC Address</string>
+    <string name="regenerate_mac_address">Regenerate MAC Address</string>
+    <string name="regenerate_mac_address_description">This will replace your current MAC address with a new one. It is not recommended to do this if you got the MAC address from your real console using the setup tool. 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 Applications to Change Plugin Loader State</string>
@@ -229,19 +228,15 @@
     <string name="spirv_shader_gen_description">Emits the fragment shader used to emulate PICA using SPIR-V instead of GLSL</string>
     <string name="async_shaders">Enable asynchronous shader compilation</string>
     <string name="async_shaders_description">Compiles shaders in the background to reduce stuttering during gameplay. When enabled expect temporary graphical glitches</string>
-    <string name="renderer_debug">Debug Renderer</string>
-    <string name="renderer_debug_description">Log additional graphics related debug information. When enabled, game performance will be significantly reduced.</string>
-    <string name="vsync">Enable V-Sync</string>
-    <string name="vsync_description">Synchronizes the game frame rate to the refresh rate of your device.</string>
     <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 applications by applying a filter to textures. The supported filters are Anime4K Ultrafast, Bicubic, ScaleForce, xBRZ freescale, and MMPX.</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) applications with dynamic framerates.</string>
     <string name="advanced">Advanced"</string>
     <string name="texture_sampling_name">Texture Sampling</string>
     <string name="texture_sampling_description">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.</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>
     <string name="shaders_accurate_mul_description">Uses more accurate multiplication in hardware shaders, which may fix some graphical bugs. When enabled, performance will be reduced.</string>
     <string name="asynchronous_gpu">Enable asynchronous GPU emulation</string>
@@ -274,6 +269,8 @@
     <string name="render3d">Stereoscopic 3D Mode</string>
     <string name="factor3d">Depth</string>
     <string name="factor3d_description">Specifies the value of the 3D slider. This should be set to higher than 0% when Stereoscopic 3D is enabled.\nNote: Depth values over 100% are not possible on real hardware and may cause graphical issues</string>
+    <string name="disable_right_eye_render">Disable Right Eye Render</string>
+    <string name="disable_right_eye_render_description">Greatly improves performance in some applications, but can cause flickering in others.</string>
     <string name="cardboard_vr">Cardboard VR</string>
     <string name="cardboard_screen_size">Cardboard Screen Size</string>
     <string name="cardboard_screen_size_description">Scales the screen to a percentage of its original size.</string>
@@ -303,6 +300,23 @@
     <string name="audio_input_type">Audio Input Device</string>
     <string name="sound_output_mode">Sound Output Mode</string>
 
+    <!-- Debug settings strings -->
+    <string name="cpu_jit">CPU JIT</string>
+    <string name="cpu_jit_description">Uses the Just-in-Time (JIT) compiler for CPU emulation. When enabled, game performance will be significantly improved.</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="cpu_clock_speed">CPU Clock Speed</string>
+    <string name="vsync">Enable V-Sync</string>
+    <string name="vsync_description">Synchronizes the game frame rate to the refresh rate of your device.</string>
+    <string name="renderer_debug">Debug Renderer</string>
+    <string name="renderer_debug_description">Log additional graphics related debug information. When enabled, game performance will be significantly reduced.</string>
+    <string name="instant_debug_log">Flush log output on every message</string>
+    <string name="instant_debug_log_description">Immediately commits the debug log to file. Use this if Azahar crashes and the log output is being cut.</string>
+    <string name="delay_start_lle_modules">Delay start with LLE modules</string>
+    <string name="delay_start_lle_modules_description">Delays the start of the app when LLE modules are enabled.</string>
+    <string name="deterministic_async_operations">Deterministic Async Operations</string>
+    <string name="deterministic_async_operations_description">Makes async operations deterministic for debugging. Enabling this may cause freezes.</string>
+
     <!-- Layout settings strings -->
     <string name="layout_screen_orientation">Screen Orientation</string>
     <string name="layout_screen_orientation_auto_sensor">Automatic</string>
@@ -342,6 +356,10 @@
     <string name="setting_disabled_description">This setting is currently disabled due to another setting not being the appropriate value.</string>
     <string name="setting_not_editable_description">This option can\'t be changed while a game is running.</string>
     <string name="auto_select">Auto-Select</string>
+    <string name="start">Start</string>
+    <string name="cancelling">Cancelling…</string>
+    <string name="important">Important</string>
+    <string name="dont_show_again">Don\'t show again</string>
 
     <!-- Add Directory Screen-->
     <string name="select_game_folder">Select Game Folder</string>
@@ -428,6 +446,9 @@
     <string name="emulation_show_overlay">Show Overlay</string>
     <string name="emulation_close_game">Close Game</string>
     <string name="emulation_toggle_pause">Toggle Pause</string>
+    <string name="miscellaneous">Miscellaneous</string>
+    <string name="use_artic_base_controller">Use Artic Controller when connected to Artic Base Server</string>
+    <string name="use_artic_base_controller_description">Use the controls provided by Artic Base Server when connected to it instead of the configured input device.</string>
     <string name="emulation_close_game_message">Are you sure that you would like to close the current game?</string>
     <string name="menu_emulation_amiibo">Amiibo</string>
     <string name="menu_emulation_amiibo_load">Load</string>
@@ -571,10 +592,6 @@
     <string name="use_black_backgrounds">Black Backgrounds</string>
     <string name="use_black_backgrounds_description">When using the dark theme, apply black backgrounds.</string>
 
-    <!-- Clock types -->
-    <string name="device_clock">Device Clock</string>
-    <string name="simulated_clock">Simulated Clock</string>
-
     <!-- Region names -->
     <string name="system_region_jpn">JPN</string>
     <string name="system_region_usa">USA</string>
@@ -800,8 +817,6 @@
     <string name="artic_base_connect_description">Connect to a real console that is running an Artic Base server</string>
     <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) applications with dynamic framerates.</string>
 
     <!-- Quickload&Save-->
     <string name="emulation_quicksave_slot">Quicksave</string>
@@ -809,23 +824,5 @@
     <string name="emulation_quickload">Quickload</string>
     <string name="emulation_occupied_quicksave_slot">Quicksave - %1$tF %1$tR</string>
     <string name="quickload_not_found">No Quicksave available.</string>
-    <string name="miscellaneous">Miscellaneous</string>
-    <string name="use_artic_base_controller">Use Artic Controller when connected to Artic Base Server</string>
-    <string name="use_artic_base_controller_description">Use the controls provided by Artic Base Server when connected to it instead of the configured input device.</string>
-    <string name="instant_debug_log">Flush log output on every message</string>
-    <string name="instant_debug_log_description">Immediately commits the debug log to file. Use this if Azahar 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_description">Greatly improves performance in some applications, but can cause flickering in others.</string>
-    <string name="delay_start_lle_modules">Delay start with LLE modules</string>
-    <string name="delay_start_lle_modules_description">Delays the start of the app when LLE modules are enabled.</string>
-    <string name="deterministic_async_operations">Deterministic Async Operations</string>
-    <string name="deterministic_async_operations_description">Makes async operations deterministic for debugging. Enabling this may cause freezes.</string>
-    <string name="enable_required_online_lle_modules">Enable required LLE modules for online features (if installed)</string>
-    <string name="enable_required_online_lle_modules_desc">Enables the LLE modules required for online multiplayer, eShop access, etc.</string>
-    <string name="emulation_settings">Emulation Settings</string>
-    <string name="profile_settings">Profile Settings</string>
-    <string name="mac_address">MAC Address</string>
-    <string name="regenerate_mac_address">Regenerate MAC Address</string>
-    <string name="regenerate_mac_address_description">This will replace your current MAC address with a new one. It is not recommended to do this if you got the MAC address from your real console using the setup tool. Continue?</string>
 
 </resources>