diff options
| author | Lioncash <mathew1800@gmail.com> | 2013-09-04 07:32:28 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2013-09-04 07:32:28 -0400 |
| commit | 48cda9d26ffa540874cde317f0e86e18fd6fb9f4 (patch) | |
| tree | fdbd40de32d265d64abd835e5bbfad80b3f61fbf /Source/Android | |
| parent | a83d4e72261e67b654071c43b136c4954a4b9bfc (diff) | |
[Android] Display the name of the control that is being bound in the input settings. Makes the binding description more informative.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/res/values-ja/strings.xml | 2 | ||||
| -rw-r--r-- | Source/Android/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index 3dfc3732a9..31f37a64d4 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -40,7 +40,7 @@ <!-- Input Config Fragment --> <string name="input_settings">入力設定</string> <string name="input_binding">入力バインディング</string> - <string name="input_binding_descrip">このコントロールにバインドするための入力を移動または押してください。</string> + <string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string> <string name="button_a">Aボタン</string> <string name="button_b">Bボタン</string> <string name="button_start">スタートボタン</string> diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index 81490f4c93..67e00e05ff 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -40,7 +40,7 @@ <!-- 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="input_binding_descrip">Press or move an input to bind it to %1$s</string> <string name="button_a">Button A</string> <string name="button_b">Button B</string> <string name="button_start">Button Start</string> diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java index 985fb6d45e..1436f4bdd7 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java @@ -183,7 +183,7 @@ public final class InputConfigFragment extends PreferenceFragment // Set the title and description message. dialog.setTitle(R.string.input_binding); - dialog.setMessage(getString(R.string.input_binding_descrip)); + dialog.setMessage(String.format(getString(R.string.input_binding_descrip), pref.getTitle())); // Don't allow the dialog to close when a user taps // outside of it. They must press cancel or provide an input. |