diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-29 21:27:17 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-29 21:27:17 -0600 |
| commit | 7bdd8191dbbde1324d2848fc256be820bc437fa2 (patch) | |
| tree | b2f8e22e2f85264bb3d6fa9af826fc1653c1a5f5 /Source/Android/res | |
| parent | 00a25cdaf5379a5ea3879ad7743cce47c9f44d65 (diff) | |
| parent | 69137cff4c58fbdfcb2b67ad51d2d68cc8ca0cbc (diff) | |
Merge branch 'master' into android-new-control-input-overlay
Conflicts:
Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
Diffstat (limited to 'Source/Android/res')
| -rw-r--r-- | Source/Android/res/values-ja/strings.xml | 1 | ||||
| -rw-r--r-- | Source/Android/res/values/strings.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index f7e272b238..6b6d9b461d 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -29,6 +29,7 @@ <!-- Game List Activity - Device Compatibility AlertDialog --> <string name="device_compat_warning">デバイスの互換性の警告</string> <string name="device_compat_warning_msg">この電話は、NEON拡張をサポートしていません。 おそらくDolphinを実行することはできません。\nあなたはとにかくそれを実行してみますか？</string> + <string name="device_gles3compat_warning_msg">デバイスはOpenGLES3のビデオドライバのバグがあります。\nあなたはとにかくそれを使用してみたいのですか？</string> <!-- Game List Fragment --> <string name="file_clicked">クリックされたファイル： %1$s</string> diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index 3e95b5abb0..da045378a2 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -29,6 +29,7 @@ <!-- Game List Activity - Device Compatibility AlertDialog --> <string name="device_compat_warning">Device Compatibility Warning</string> <string name="device_compat_warning_msg">Your phone doesn\'t support NEON which makes it incapable of running Dolphin Mobile?\nDo you want to try anyway?</string> + <string name="device_gles3compat_warning_msg">Your device has known buggy video drivers for OpenGL ES 3.\nDo you want to try anyway?</string> <!-- Game List Fragment --> <string name="file_clicked">File clicked: %1$s</string> |