summaryrefslogtreecommitdiff
path: root/Source/Android/res/values/strings.xml
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2013-08-26 09:15:50 -0400
committerLioncash <mathew1800@gmail.com>2013-08-26 09:15:50 -0400
commite0519356591ddb6060dace4190bc733d04a0e53b (patch)
treefb3c44243d946f518130ebbfd28e6f014a9695a8 /Source/Android/res/values/strings.xml
parent0e8f9d8abcef26a4b17e7a38b001efbae0f83e8d (diff)
parent08153387c5d739b305dd6e2daf85db251e1891aa (diff)
Merge branch 'android-new-input-ui'
Diffstat (limited to 'Source/Android/res/values/strings.xml')
-rw-r--r--Source/Android/res/values/strings.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index dac787e4bc..1abeb4992d 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -31,6 +31,9 @@
<string name="file_clicked">File clicked: </string>
<!-- Input Config Fragment -->
+ <string name="input_settings">Input</string>
+ <string name="input_binding">Input Binding</string>
+ <string name="input_binding_descrip">Press or move an input to bind it to this control.</string>
<string name="button_a">Button A</string>
<string name="button_b">Button B</string>
<string name="button_start">Button Start</string>
@@ -115,6 +118,7 @@
<!-- Miscellaneous -->
<string name="yes">Yes</string>
<string name="no">No</string>
+ <string name="cancel">Cancel</string>
<string name="disabled">Disabled</string>
<string name="other">Other</string>