VERY experimental Nintendo Switch 2 emulator
C++
android: Move all array strings to main strings file
Charles Lombardo6d28b14f2d2e
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xmlindex c59c8b65a1..7e25f12b82 100644--- a/src/android/app/src/main/res/values/arrays.xml+++ b/src/android/app/src/main/res/values/arrays.xml@@ -1,16 +1,15 @@<?xml version="1.0" encoding="utf-8"?>--<!-- All lists for ListPreference keys/values are placed here --><resources>+<string-array name="regionNames">- <item>Auto-select</item>- <item>Japan</item>- <item>USA</item>- <item>Europe</item>- <item>Australia</item>- <item>China</item>- <item>Korea</item>- <item>Taiwan</item>+ <item>@string/region_auto</item>+ <item>@string/region_japan</item>+ <item>@string/region_usa</item>+ <item>@string/region_europe</item>+ <item>@string/region_australia</item>+ <item>@string/region_china</item>+ <item>@string/region_korea</item>+ <item>@string/region_taiwan</item></string-array><integer-array name="regionValues">@@ -25,24 +24,24 @@</integer-array><string-array name="languageNames">- <item>Japanese (日本語)</item>- <item>English</item>- <item>French (Français)</item>- <item>German (Deutsch)</item>- <item>Italian (Italiano)</item>- <item>Spanish (Español)</item>- <item>Chinese (简体中文)</item>- <item>Korean (한국어)</item>- <item>Dutch (Nederlands)</item>- <item>Portuguese (Português)</item>- <item>Russian (Русский)</item>- <item>Taiwanese (台湾)</item>- <item>British English</item>- <item>Canadian French (Français canadien)</item>- <item>Latin American Spanish (Español latinoamericano)</item>- <item>Simplified Chinese (简体中文)</item>- <item>Traditional Chinese (正體中文))</item>- <item>Brazilian Portuguese (Portugues do Brasil)</item>+ <item>@string/language_japanese</item>+ <item>@string/language_english</item>+ <item>@string/language_french</item>+ <item>@string/langauge_german</item>+ <item>@string/language_italian</item>+ <item>@string/language_spanish</item>+ <item>@string/language_chinese</item>+ <item>@string/language_korean</item>+ <item>@string/language_dutch</item>+ <item>@string/language_portuguese</item>+ <item>@string/language_russian</item>+ <item>@string/language_taiwanese</item>+ <item>@string/language_british_english</item>+ <item>@string/language_canadian_french</item>+ <item>@string/language_latin_american_spanish</item>+ <item>@string/language_simplified_chinese</item>+ <item>@string/language_traditional_chinese</item>+ <item>@string/language_brazilian_portuguese</item></string-array><integer-array name="languageValues">@@ -67,8 +66,8 @@</integer-array><string-array name="rendererApiNames">- <item>Vulkan</item>- <item>None</item>+ <item>@string/renderer_vulkan</item>+ <item>@string/renderer_none</item></string-array><integer-array name="rendererApiValues">@@ -77,9 +76,9 @@</integer-array><string-array name="rendererAccuracyNames">- <item>Normal</item>- <item>High</item>- <item>Extreme (Slow)</item>+ <item>@string/renderer_accuracy_normal</item>+ <item>@string/renderer_accuracy_high</item>+ <item>@string/renderer_accuracy_extreme</item></string-array><integer-array name="rendererAccuracyValues">@@ -89,12 +88,12 @@</integer-array><string-array name="rendererResolutionNames">- <item>0.5X (360p/540p)</item>- <item>0.75X (540p/810p)</item>- <item>1X (720p/1080p)</item>- <item>2X (1440p/2160p) (Slow)</item>- <item>3X (2160p/3240p) (Slow)</item>- <item>4X (2880p/4320p) (Slow)</item>+ <item>@string/resolution_half</item>+ <item>@string/resolution_three_quarter</item>+ <item>@string/resolution_one</item>+ <item>@string/resolution_two</item>+ <item>@string/resolution_three</item>+ <item>@string/resolution_four</item></string-array><integer-array name="rendererResolutionValues">@@ -107,11 +106,11 @@</integer-array><string-array name="rendererAspectRatioNames">- <item>Default (16:9)</item>- <item>Force 4:3</item>- <item>Force 21:9</item>- <item>Force 16:10</item>- <item>Stretch to Window</item>+ <item>@string/ratio_default</item>+ <item>@string/ratio_force_four_three</item>+ <item>@string/ratio_force_twenty_one_nine</item>+ <item>@string/ratio_force_sixteen_ten</item>+ <item>@string/ratio_stretch</item></string-array><integer-array name="rendererAspectRatioValues">@@ -123,10 +122,10 @@</integer-array><string-array name="cpuAccuracyNames">- <item>Auto</item>- <item>Accurate</item>- <item>Unsafe</item>- <item>Paranoid (Slow)</item>+ <item>@string/cpu_accuracy_auto</item>+ <item>@string/cpu_accuracy_accurate</item>+ <item>@string/cpu_accuracy_unsafe</item>+ <item>@string/cpu_accuracy_paranoid</item></string-array><integer-array name="cpuAccuracyValues">@@ -135,4 +134,5 @@<item>2</item><item>3</item></integer-array>+</resources>diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex 2df533cbf1..2df25f0ffc 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -112,4 +112,65 @@<string name="fatal_error">Fatal Error</string><string name="fatal_error_message">A fatal error occurred. Check the log for details.\nContinuing emulation may result in crashes and bugs.</string><string name="performance_warning">Turning off this setting will significantly reduce emulation performance! For the best experience, it is recommended that you leave this setting enabled.</string>++ <!-- Region Names -->+ <string name="region_auto">Auto-select</string>+ <string name="region_japan">Japan</string>+ <string name="region_usa">USA</string>+ <string name="region_europe">Europe</string>+ <string name="region_australia">Australia</string>+ <string name="region_china">China</string>+ <string name="region_korea">Korea</string>+ <string name="region_taiwan">Taiwan</string>++ <!-- Language Names -->+ <string name="language_japanese">Japanese (日本語)</string>+ <string name="language_english">English</string>+ <string name="language_french">French (Français)</string>+ <string name="langauge_german">German (Deutsch)</string>+ <string name="language_italian">Italian (Italiano)</string>+ <string name="language_spanish">Spanish (Español)</string>+ <string name="language_chinese">Chinese (简体中文)</string>+ <string name="language_korean">Korean (한국어)</string>+ <string name="language_dutch">Dutch (Nederlands)</string>+ <string name="language_portuguese">Portuguese (Português)</string>+ <string name="language_russian">Russian (Русский)</string>+ <string name="language_taiwanese">Taiwanese (台湾)</string>+ <string name="language_british_english">British English</string>+ <string name="language_canadian_french">Canadian French (Français canadien)</string>+ <string name="language_latin_american_spanish">Latin American Spanish (Español latinoamericano)</string>+ <string name="language_simplified_chinese">Simplified Chinese (简体中文)</string>+ <string name="language_traditional_chinese">Traditional Chinese (正體中文)</string>+ <string name="language_brazilian_portuguese">Brazilian Portuguese (Portugues do Brasil)</string>++ <!-- Renderer APIs -->+ <string name="renderer_vulkan">Vulkan</string>+ <string name="renderer_none">None</string>++ <!-- Renderer Accuracy -->+ <string name="renderer_accuracy_normal">Normal</string>+ <string name="renderer_accuracy_high">High</string>+ <string name="renderer_accuracy_extreme">Extreme (Slow)</string>++ <!-- Resolutions -->+ <string name="resolution_half">0.5X (360p/540p)</string>+ <string name="resolution_three_quarter">0.75X (540p/810p)</string>+ <string name="resolution_one">1X (720p/1080p)</string>+ <string name="resolution_two">2X (1440p/2160p) (Slow)</string>+ <string name="resolution_three">3X (2160p/3240p) (Slow)</string>+ <string name="resolution_four">4X (2880p/4320p) (Slow)</string>++ <!-- Aspect Ratios -->+ <string name="ratio_default">Default (16:9)</string>+ <string name="ratio_force_four_three">Force 4:3</string>+ <string name="ratio_force_twenty_one_nine">Force 21:9</string>+ <string name="ratio_force_sixteen_ten">Force 16:10</string>+ <string name="ratio_stretch">Stretch to Window</string>++ <!-- CPU Accuracy -->+ <string name="cpu_accuracy_auto">Auto</string>+ <string name="cpu_accuracy_accurate">Accurate</string>+ <string name="cpu_accuracy_unsafe">Unsafe</string>+ <string name="cpu_accuracy_paranoid">Paranoid (Slow)</string>+</resources>