From 93056e398857fe3ab36ad94b0a73bebe31617111 Mon Sep 17 00:00:00 2001
From: sigmabeta <sigmabeta@users.noreply.github.com>
Date: Sun, 31 Jan 2016 10:06:00 -0500
Subject: [PATCH 1/2] Change SettingsActivity label to "Settings" instead of
 "CPU Settings"

---
 Source/Android/app/src/main/AndroidManifest.xml    | 2 +-
 Source/Android/app/src/main/res/values/strings.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
index 57a0e62abd..2290b940df 100644
--- 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/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index cf391e8ec8..5dd007f34c 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -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>

From 7542eafd58cd1964764f24cbae37c3bfc68fc579 Mon Sep 17 00:00:00 2001
From: sigmabeta <sigmabeta@users.noreply.github.com>
Date: Sun, 31 Jan 2016 10:17:30 -0500
Subject: [PATCH 2/2] Fix capitalization on "GameCube" strings

---
 Source/Android/app/src/main/res/values/arrays.xml  | 2 +-
 Source/Android/app/src/main/res/values/strings.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index d327a5004e..b1179942bf 100644
--- 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
index 5dd007f34c..4ae5e14c12 100644
--- 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-->
@@ -349,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>