Merge pull request #3584 from sigmabeta/android-settings-text-fix

[Android] Change SettingsActivity label to "Settings" instead of "CPU Settings"
dolphin-emu · Feb 1, 2016 · 2282651 · 2282651
2 parents 31523b7 + 7542eaf
commit 2282651
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
@@ -58,7 +58,7 @@
         <activity
             android:name=".ui.settings.SettingsActivity"
             android:theme="@style/DolphinSettingsGamecube"
-            android:label="@string/grid_menu_core_settings"/>
+            android:label="@string/preferences_settings"/>
 
         <activity
             android:name=".activities.EmulationActivity"

diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
@@ -151,7 +151,7 @@
     <string-array name="gcpadTypeEntries">
         <item>Disabled</item>
         <item>Emulated</item>
-        <item>Gamecube Adapter</item>
+        <item>GameCube Adapter</item>
     </string-array>
     <integer-array name="gcpadTypeValues">
         <item>0</item>

diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
@@ -323,7 +323,7 @@
     <!-- Game Grid Screen-->
     <string name="grid_menu_core_settings">CPU Settings</string>
     <string name="grid_menu_video_settings">Video Settings</string>
-    <string name="grid_menu_gcpad_settings">Gamecube Input</string>
+    <string name="grid_menu_gcpad_settings">GameCube Input</string>
     <string name="grid_menu_refresh">Refresh Library</string>
 
     <!-- Add Directory Screen-->
@@ -333,6 +333,7 @@
 
     <!-- Preferences Screen -->
     <string name="preferences_exit_no_save">Exit Without Saving</string>
+    <string name="preferences_settings">Settings</string>
     <string name="preferences_cpu">CPU Settings</string>
     <string name="preferences_input">Input Settings</string>
     <string name="preferences_extensions">Extension Bindings</string>
@@ -348,7 +349,7 @@
 
     <!-- GC Adapter Menu-->
     <string name="gc_adapter_rumble">Enable Vibration</string>
-    <string name="gc_adapter_rumble_description">Enable the vibration function for this Gamecube controller.</string>
+    <string name="gc_adapter_rumble_description">Enable the vibration function for this GameCube controller.</string>
     <string name="gc_adapter_bongos">Bongo Controller</string>
     <string name="gc_adapter_bongos_description">Enable this if you are using bongos on this port.</string>