diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-08-28 00:57:37 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-08-28 00:57:37 +1200 |
| commit | 2a68b65cda35d325efcd347b090f76f14a5a033e (patch) | |
| tree | e91f460f870b518bb249e08ce5f41bb3c33d9f53 /Source/Android/res/values/strings.xml | |
| parent | 75c398118fb1d470a82735f93f5c0d1fe0a91664 (diff) | |
| parent | 40a1cb5dfed6d5b255d1f330af2cdc14446e0b53 (diff) | |
Merge branch 'master' into wii-network
Diffstat (limited to 'Source/Android/res/values/strings.xml')
| -rw-r--r-- | Source/Android/res/values/strings.xml | 4 |
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> |