Skip to content

Commit

Permalink
Merge pull request #4 from lioncash/android-about-menu-info
Browse files Browse the repository at this point in the history
Expand the Android app's about menu to include additional info about a user's device.
  • Loading branch information
neobrain committed Jan 28, 2014
2 parents fabdd8a + b9e7749 commit 7b459d2
Show file tree
Hide file tree
Showing 18 changed files with 1,543 additions and 319 deletions.
1 change: 1 addition & 0 deletions Source/Android/AndroidManifest.xml
Expand Up @@ -33,6 +33,7 @@
</intent-filter>
</activity>

<activity android:name="org.dolphinemu.dolphinemu.about.AboutActivity"/>
<activity android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"/>

<activity
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions Source/Android/res/values-ja/strings.xml
Expand Up @@ -12,6 +12,21 @@
<string name="build_revision">ビルドのバージョン</string>
<string name="supports_gles3">サポートのOpenGL ES 3</string>
<string name="supports_neon">サポートのNEON</string>
<string name="cpu">CPU</string>
<string name="gles_two">GLES 2</string>
<string name="gles_three">GLES 3</string>
<string name="desktop_gl">OpenGL</string>

<!-- About Menu - CPU Info -->
<string name="cpu_abi_one">CPU ABI 1</string>
<string name="cpu_abi_two">CPU ABI 2</string>
<string name="cpu_info">CPU情報</string>
<string name="cpu_type">CPUタイプ</string>
<string name="cpu_features">CPUの命令セットと機能</string>
<string name="num_cores">CPUコア</string>
<string name="cpu_implementer">CPUの実装</string>
<string name="cpu_hardware">ハードウェア</string>
<string name="unknown_part_num">不明 (%1$d)。 我々はそれを文書化することができますので、この番号を報告してください。 </string>

<!-- Folder Browser -->
<string name="current_dir">現在のディレクトリ: %1$s</string>
Expand Down
16 changes: 16 additions & 0 deletions Source/Android/res/values/strings.xml
Expand Up @@ -12,6 +12,22 @@
<string name="build_revision">Build Revision</string>
<string name="supports_gles3">Supports OpenGL ES 3</string>
<string name="supports_neon">Supports NEON</string>
<string name="general">General</string>
<string name="cpu">CPU</string>
<string name="gles_two">GLES 2</string>
<string name="gles_three">GLES 3</string>
<string name="desktop_gl">OpenGL</string>

<!-- About Menu - CPU Info -->
<string name="cpu_abi_one">CPU ABI 1</string>
<string name="cpu_abi_two">CPU ABI 2</string>
<string name="cpu_info">CPU Info</string>
<string name="cpu_type">CPU Type</string>
<string name="cpu_features">CPU Features</string>
<string name="num_cores">Number of Cores</string>
<string name="cpu_implementer">CPU Implementer</string>
<string name="cpu_hardware">Hardware</string>
<string name="unknown_part_num">Unknown (%1$d). Please report this number so it can be documented!</string>

<!-- Folder Browser -->
<string name="current_dir">Current Dir: %1$s</string>
Expand Down
119 changes: 0 additions & 119 deletions Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java

This file was deleted.

0 comments on commit 7b459d2

Please sign in to comment.