From dbfcbcb67068c1f6e2ad13e0286c72219e9ca429 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Mon, 5 Dec 2022 19:28:41 -0500 Subject: [PATCH] Android: Migrate all strings to strings.xml --- ...nlineUpdateRegionSelectDialogFragment.java | 5 +- .../app/src/main/res/values/arrays.xml | 454 +++++++++--------- .../app/src/main/res/values/strings.xml | 227 ++++++++- 3 files changed, 447 insertions(+), 239 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.java index 7184c7ba39..ea1c535ca4 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.java @@ -20,8 +20,9 @@ public class OnlineUpdateRegionSelectDialogFragment extends DialogFragment @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { - String[] items = {getString(R.string.europe), getString( - R.string.japan), getString(R.string.korea), getString(R.string.united_states)}; + String[] items = + {getString(R.string.country_europe), getString(R.string.country_japan), getString( + R.string.country_korea), getString(R.string.country_usa)}; int checkedItem = -1; return new MaterialAlertDialogBuilder(requireContext()) diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml index 4b789407b3..af3b5e29b0 100644 --- a/Source/Android/app/src/main/res/values/arrays.xml +++ b/Source/Android/app/src/main/res/values/arrays.xml @@ -16,65 +16,65 @@ - - JIT Recompiler for x86-64 (recommended) - Cached Interpreter (slower) - Interpreter (slowest) + + @string/jit_recompiler_x86 + @string/cached_interpreter_slower + @string/interpreter_slowest - + 1 5 0 - - JIT Recompiler for ARM64 (recommended) - Cached Interpreter (slower) - Interpreter (slowest) + + @string/jit_recompiler_arm64 + @string/cached_interpreter_slower + @string/interpreter_slowest - + 4 5 0 - - Cached Interpreter - Interpreter + + @string/cached_interpreter + @string/interpreter - + 5 0 - - DSP HLE (recommended) - DSP LLE Recompiler (slow) - DSP LLE Interpreter (very slow) + + @string/dsp_hle + @string/dsp_lle_recompiler + @string/dsp_lle_interpreter - + 0 1 2 - - DSP HLE (recommended) - DSP LLE Interpreter (very slow) + + @string/dsp_hle + @string/dsp_lle_interpreter - + 0 2 - - English - German - French - Spanish - Italian - Dutch + + @string/language_english + @string/language_german + @string/language_french + @string/language_spanish + @string/language_italian + @string/language_dutch - + 0 1 2 @@ -84,13 +84,13 @@ - - Nothing - Dummy - Memory Card - GCI Folder + + @string/device_nothing + @string/device_dummy + @string/device_memory_card + @string/device_gci_folder - + 255 0 1 @@ -98,33 +98,33 @@ - - Nothing - Dummy - Broadband Adapter (XLink Kai) - Broadband Adapter (HLE) + + @string/device_nothing + @string/device_dummy + @string/broadband_adapter_xlink + @string/broadband_adapter_hle - + 255 0 10 12 - + - Japanese - English - German - French - Spanish - Italian - Dutch - Simplified Chinese - Traditional Chinese - Korean + @string/language_japanese + @string/language_english + @string/language_german + @string/language_french + @string/language_spanish + @string/language_italian + @string/language_dutch + @string/language_simplified_chinese + @string/language_traditional_chinese + @string/language_korean - + 0 1 2 @@ -139,11 +139,11 @@ - Mono - Stereo - Surround + @string/sound_mode_mono + @string/sound_mode_stereo + @string/sound_mode_surround - + 0 1 2 @@ -151,35 +151,35 @@ - Top - Bottom + @string/sensor_position_top + @string/sensor_position_bottom - + 1 0 - - Notice - Error - Warning - Info + + @string/log_notice + @string/log_error + @string/log_warning + @string/log_info - + 1 2 3 4 - - Notice - Error - Warning - Info - Debug + + @string/log_notice + @string/log_error + @string/log_warning + @string/log_info + @string/log_debug - + 1 2 3 @@ -189,12 +189,12 @@ - OpenGL - Vulkan - Software - Null + @string/backend_opengl + @string/backend_vulkan + @string/backend_software + @string/backend_null - + OGL Vulkan Software Renderer @@ -203,14 +203,14 @@ - None - Nunchuk - Classic - Guitar - Drums - Turntable + @string/extension_none + @string/extension_nunchuk + @string/extension_classic + @string/extension_guitar + @string/extension_drums + @string/extension_turntable - + None Nunchuk Classic @@ -220,25 +220,25 @@ - - Fast - Medium - Safe + + @string/accuracy_fast + @string/accuracy_medium + @string/accuracy_safe - + 128 512 0 - - Specialized (Default) - Exclusive Ubershaders - Hybrid Ubershaders - Skip Drawing + + @string/shader_compilation_specialized + @string/shader_compilation_exclusive_ubershaders + @string/shader_compilation_hybrid_ubershaders + @string/shader_compilation_skip_drawing - + 0 1 2 @@ -246,13 +246,13 @@ - - Specialized (Default): Ubershaders are never used. Stuttering will occur during shader compilation, but GPU demands are low. Recommended for low-end hardware. If unsure, select this mode. - Exclusive Ubershaders: Ubershaders will always be used. Provides a near stutter-free experience at the cost of very high GPU performance requirements. Don\'t use this unless you encountered stuttering with Hybrid Ubershaders and have a very powerful GPU. - Hybrid Ubershaders: Ubershaders will be used to prevent stuttering during shader compilation, but specialized shaders will be used when they will not cause stuttering. In the best case it eliminates shader compilation stuttering while having minimal performance impact, but results depend on video driver behavior. - Skip Drawing: Prevents shader compilation stuttering by not rendering waiting objects. Can work in scenarios where Ubershaders doesn\'t, at the cost of introducing visual glitches and broken effects. Not recommended, only use if the other options give poor results on your system. + + @string/shader_compilation_specialized_description + @string/shader_compilation_exclusive_ubershaders_description + @string/shader_compilation_hybrid_ubershaders_description + @string/shader_compilation_skip_drawing_description - + 0 1 2 @@ -260,15 +260,15 @@ - - 1x Native (640x528) - 2x Native (1280x1056) for 720p - 3x Native (1920x1584) for 1080p - 4x Native (2560x2112) - 5x Native (3200x2640) - 6x Native (3840x3168) for 4K + + @string/resolution_one_native + @string/resolution_two_native + @string/resolution_three_native + @string/resolution_four_native + @string/resolution_five_native + @string/resolution_six_native - + 1 2 3 @@ -279,10 +279,10 @@ - Off - 2x - 4x - 8x + @string/multiple_off + @string/multiple_two + @string/multiple_four + @string/multiple_eight 1 @@ -292,14 +292,14 @@ - - 1x - 2x - 4x - 8x - 16x + + @string/multiple_one + @string/multiple_two + @string/multiple_four + @string/multiple_eight + @string/multiple_sixteen - + 0 1 2 @@ -308,13 +308,13 @@ - - Off - Side-by-Side - Top-and-Bottom - Anaglyph + + @string/stereoscopy_off + @string/stereoscopy_side_by_side + @string/stereoscopy_top_and_bottom + @string/stereoscopy_anaglyph - + 0 1 2 @@ -322,13 +322,13 @@ - - Auto - Force 16:9 - Force 4:3 - Stretch To Window + + @string/aspect_ratio_auto + @string/aspect_ratio_force_sixteen_by_nine + @string/aspect_ratio_force_four_by_three + @string/aspect_ratio_stretch - + 0 1 2 @@ -336,26 +336,26 @@ - Europe - Japan - USA - Australia - France - Germany - Italy - Korea - Netherlands - Russia - Spain - Taiwan - World - Unknown + @string/country_europe + @string/country_japan + @string/country_usa + @string/country_australia + @string/country_france + @string/country_germany + @string/country_italy + @string/country_korea + @string/country_netherlands + @string/country_russia + @string/country_spain + @string/country_taiwan + @string/country_world + @string/country_unknown - Disabled - Emulated - GameCube Adapter + @string/gcpad_disabled + @string/gcpad_emulated + @string/gcpad_gc_adapter 0 @@ -364,9 +364,9 @@ - Disabled - Emulated - Real Wii Remote (DolphinBar required) + @string/wiimote_disabled + @string/wiimote_emulated + @string/wiimote_real 0 @@ -375,12 +375,12 @@ - GameCube Controller - Wii Remote - Horizontal Wii Remote - Wii Remote + Nunchuk - Classic Controller - None + @string/controller_gc + @string/controller_wiimote + @string/controller_horizontal_wiimote + @string/controller_wiimote_plus_nunchuk + @string/controller_classic + @string/controller_none None @@ -397,12 +397,12 @@ X Y Z - Start + @string/gamepad_start L R - D-Pad - Main Stick - C Stick + @string/gamepad_d_pad + @string/gamepad_main_stick + @string/gamepad_c_stick @@ -412,8 +412,8 @@ 2 + - - Home - D-Pad + @string/gamepad_home + @string/gamepad_d_pad @@ -423,11 +423,11 @@ 2 + - - Home - D-Pad + @string/gamepad_home + @string/gamepad_d_pad C Z - Nunchuk Stick + @string/gamepad_nunchuk_stick @@ -437,40 +437,40 @@ y + - - Home + @string/gamepad_home L R ZL ZR - D-Pad - Left Stick - Right Stick + @string/gamepad_d_pad + @string/gamepad_left_stick + @string/gamepad_right_stick - Disabled - Follow - Drag + @string/ir_disabled + @string/ir_follow + @string/ir_drag - Button A - Button B - Button 2 + @string/double_tap_a + @string/double_tap_b + @string/double_tap_2 - Button A - Button B - Button 2 - Classic A + @string/double_tap_a + @string/double_tap_b + @string/double_tap_2 + @string/double_tap_classic_a - Landscape - Landscape (reverse) - Portrait - Auto + @string/orientation_landscape + @string/orientation_landscape_reverse + @string/orientation_portrait + @string/orientation_auto 0 @@ -481,10 +481,10 @@ - Default - Material Default - Green - Pink + @string/theme_default + @string/theme_material_default + @string/theme_green + @string/theme_pink 0 @@ -493,11 +493,11 @@ 4 - Default - Material You - Material Default - Green - Pink + @string/theme_default + @string/theme_material_you + @string/theme_material_default + @string/theme_green + @string/theme_pink 0 @@ -508,9 +508,9 @@ - Follow System - Light - Dark + @string/theme_mode_follow_system + @string/theme_mode_light + @string/theme_mode_dark -1 @@ -519,9 +519,9 @@ - Never - On Idle Skipping - Always + @string/sync_gpu_never + @string/sync_gpu_idle + @string/sync_gpu_always 0 @@ -530,9 +530,9 @@ - Use Device Sensors (With Pointer Emulation) - Use Device Sensors (Without Pointer Emulation) - Don\'t Use Device Sensors + @string/motion_device_with_pointer + @string/motion_device_without_pointer + @string/motion_no_device @@ -549,27 +549,27 @@ - 32 KiB + @string/block_size_32_kib 32768 - 2 MiB + @string/block_size_2_mib 2097152 - 32 KiB - 64 KiB - 128 KiB - 256 KiB - 512 KiB - 1 MiB - 2 MiB + @string/block_size_32_kib + @string/block_size_64_kib + @string/block_size_128_kib + @string/block_size_256_kib + @string/block_size_512_kib + @string/block_size_1_mib + @string/block_size_2_mib 32768 @@ -581,19 +581,19 @@ 2097152 - - Deflate + + @string/compression_deflate 0 - No Compression - Purge - bzip2 (slow) - LZMA (slow) - LZMA2 (slow) + @string/compression_none + @string/compression_purge + @string/compression_bzip2 + @string/compression_lzma + @string/compression_lzma2 0 @@ -604,11 +604,11 @@ - No Compression - bzip2 (slow) - LZMA (slow) - LZMA2 (slow) - Zstandard (recommended) + @string/compression_none + @string/compression_bzip2 + @string/compression_lzma + @string/compression_lzma2 + @string/compression_zstandard 0 diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 8b6f1a5cf4..b3230427b2 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -154,7 +154,7 @@ You are about to convert the content of the SD sync folder into the SD card file. All current content of the file will be deleted. Are you sure you want to continue? Convert File to Folder Now You are about to convert the content of the SD card file into the SD sync folder. All current content of the folder will be deleted. Are you sure you want to continue? - Converting... + Converting… Conversion done. Conversion failed. Wii Remote Rumble @@ -200,14 +200,10 @@ Please select a region - Europe - Japan - Korea - United States Updating - Updating title %016x...\nThis can take a while. + Updating title %016x…\nThis can take a while. The emulated Wii console has been updated. The emulated Wii console is already up-to-date. The game\'s region does not match your console\'s. To avoid issues with the system menu, it is not possible to update the emulated console using this disc. @@ -453,8 +449,8 @@ Load Wii System Menu Load Wii System Menu (%s) Load vWii System Menu (%s) - Importing... - Exporting... + Importing… + Exporting… Do not close the app! Successfully installed this title to the NAND. Failed to install this title to the NAND. @@ -521,7 +517,7 @@ Code can\'t be empty Error on line %1$d Lines must either be all encrypted or all decrypted - Downloading... + Downloading… Failed to download codes. File contained no codes. Downloaded %1$d codes. (added %2$d) @@ -606,7 +602,7 @@ It can efficiently compress both junk data and encrypted Wii data. Device rumble not found Due to the Scoped Storage policy in Android 11 and newer, you can\'t change this path. - Loading Settings... + Loading Settings… This setting can\'t be changed while a game is running. Long press a setting to clear it. Do you want to restore this setting to its default value? @@ -639,4 +635,215 @@ It can efficiently compress both junk data and encrypted Wii data. Ignore for this session Please make sure Continuous Scanning is enabled in Core Settings. + + JIT Recompiler for x86–64 (recommended) + JIT Recompiler for ARM64 (recommended) + Cached Interpreter (slower) + Cached Interpreter + Interpreter (slowest) + Interpreter + + + DSP HLE (recommended) + DSP LLE Recompiler (slow) + DSP LLE Interpreter (very slow) + + + English + German + French + Spanish + Italian + Dutch + Japanese + Simplified Chinese + Traditional Chinese + Korean + + + Nothing + Dummy + Memory Card + GCI Folder + + + Broadband Adapter (XLink Kai) + Broadband Adapter (HLE) + + + Mono + Stereo + Surround + + + Top + Bottom + + + Notice + Error + Warning + Info + Debug + + + OpenGL + Vulkan + Software + Null + + + None + Nunchuk + Classic + Guitar + Drums + Turntable + + + Fast + Medium + Safe + + + Specialized (Default) + Exclusive Ubershaders + Hybrid Ubershaders + Skip Drawing + + + Specialized (Default): Ubershaders are never used. Stuttering will occur during shader compilation, but GPU demands are low. Recommended for low-end hardware. If unsure, select this mode. + Exclusive Ubershaders: Ubershaders will always be used. Provides a near stutter-free experience at the cost of very high GPU performance requirements. Don\'t use this unless you encountered stuttering with Hybrid Ubershaders and have a very powerful GPU. + Hybrid Ubershaders: Ubershaders will be used to prevent stuttering during shader compilation, but specialized shaders will be used when they will not cause stuttering. In the best case it eliminates shader compilation stuttering while having minimal performance impact, but results depend on video driver behavior. + Skip Drawing: Prevents shader compilation stuttering by not rendering waiting objects. Can work in scenarios where Ubershaders doesn\'t, at the cost of introducing visual glitches and broken effects. Not recommended, only use if the other options give poor results on your system. + + + 1x Native (640x528) + 2x Native (1280x1056) for 720p + 3x Native (1920x1584) for 1080p + 4x Native (2560x2112) + 5x Native (3200x2640) + 6x Native (3840x3168) for 4K + + + Off + 1x + 2x + 4x + 8x + 16x + + + Off + Side-by-Side + Top-and-Bottom + Anaglyph + + + Auto + Force 16:9 + Force 4:3 + Stretch to Window + + + Europe + Japan + USA + Australia + France + Germany + Italy + Korea + Netherlands + Russia + Spain + Taiwan + World + Unknown + + + Disabled + Emulated + GameCube Adapter + + + Disabled + Emulated + Real Wii Remote (DolphinBar required) + + + GameCube Controller + Wii Remote + Horizontal Wii Remote + Wii Remote + Nunchuk + Classic Controller + None + + + Start + D-Pad + Main Stick + C Stick + Home + Nunchuk Stick + Left Stick + Right Stick + + + Disabled + Follow + Drag + + + Button A + Button B + Button 2 + Classic A + + + Landscape + Landscape (reverse) + Portrait + Auto + + + Default + Material You + Material Default + Green + Pink + + + Follow System + Light + Dark + + + Never + On Idle Skipping + Always + + + Use Device Sensors (With Pointer Emulation) + Use Device Sensors (Without Pointer Emulation) + Don\'t Use Device Sensors + + + 32 KiB + 64 KiB + 128 KiB + 256 KiB + 512 KiB + 1 MiB + 2 MiB + + + No Compression + Purge + Deflate + bzip2 (slow) + LZMA (slow) + LZMA2 (slow) + Zstandard (recommended) +