Merge remote-tracking branch 'origin/master' into wiimote-netplay

13 files changed, 247 insertions, 41 deletions

diff --git a/Source/Android/res/drawable-hdpi/ic_menu_file.png b/Source/Android/res/drawable-hdpi/ic_menu_file.png
new file mode 100644
index 0000000000..f204740905
--- /dev/null
+++ b/Source/Android/res/drawable-hdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-hdpi/ic_menu_folder.png b/Source/Android/res/drawable-hdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..6f441b41da
--- /dev/null
+++ b/Source/Android/res/drawable-hdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_file.png b/Source/Android/res/drawable-mdpi/ic_menu_file.png
new file mode 100644
index 0000000000..dee2577897
--- /dev/null
+++ b/Source/Android/res/drawable-mdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_folder.png b/Source/Android/res/drawable-mdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..cc81e57f7e
--- /dev/null
+++ b/Source/Android/res/drawable-mdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_file.png b/Source/Android/res/drawable-xhdpi/ic_menu_file.png
new file mode 100644
index 0000000000..85369c338e
--- /dev/null
+++ b/Source/Android/res/drawable-xhdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_folder.png b/Source/Android/res/drawable-xhdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..78500a93c1
--- /dev/null
+++ b/Source/Android/res/drawable-xhdpi/ic_menu_folder.png
diff --git a/Source/Android/res/layout/about_layout.xml b/Source/Android/res/layout/about_layout.xml
new file mode 100644
index 0000000000..7189fd7ce5
--- /dev/null
+++ b/Source/Android/res/layout/about_layout.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/FolderTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dip"
+                android:layout_marginTop="5dip"
+                android:singleLine="true"
+                android:text="Title"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/FolderSubTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:text="Subtitle" />
+
+        </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/res/layout/folderbrowser.xml b/Source/Android/res/layout/folderbrowser.xml
index 82b94e238f..d3ee4538fa 100644
--- a/Source/Android/res/layout/folderbrowser.xml
+++ b/Source/Android/res/layout/folderbrowser.xml
@@ -1,29 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:padding="3dip">
+    
+    <ImageView
+        android:id="@+id/ImageIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="6dip"/>
 
-            <TextView
-                android:id="@+id/FolderTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dip"
-                android:layout_marginTop="5dip"
-                android:singleLine="true"
-                android:text="Title"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/FolderSubTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
-                android:text="Subtitle" />
-
-        </LinearLayout>
-</LinearLayout>
+    <TextView
+        android:id="@+id/FolderSubTitle"
+        android:layout_width="fill_parent"
+        android:layout_height="26dip" 
+        
+        android:layout_toRightOf="@id/ImageIcon"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:text="Subtitle" />
+    
+    <TextView
+        android:id="@+id/FolderTitle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        
+        android:layout_toRightOf="@id/ImageIcon"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_above="@id/FolderSubTitle"
+        android:layout_alignWithParentIfMissing="true"
+                
+        android:gravity="center_vertical"
+        android:text="Title"
+        android:textStyle="bold" />
+    
+    <ImageView
+        android:src="@android:drawable/divider_horizontal_dark"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:paddingBottom="2dp"
+        android:paddingTop="2dp" />
+</RelativeLayout>
diff --git a/Source/Android/res/layout/prefs.xml b/Source/Android/res/layout/prefs.xml
index 34700f56b7..d8d8664a97 100644
--- a/Source/Android/res/layout/prefs.xml
+++ b/Source/Android/res/layout/prefs.xml
@@ -2,23 +2,23 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         >
     <PreferenceCategory
-            android:summary="Settings"
-            android:title="CPU Settings"
+            android:summary="@string/settings"
+            android:title="@string/cpu_settings"
             android:key="cpuprefcat">
         <CheckBoxPreference
                 android:key="dualcorepref"
-                android:summary="On/Off"
-                android:title="Dual Core" />
+                android:summary="@string/on_off"
+                android:title="@string/dual_core" />
     </PreferenceCategory>
     <PreferenceCategory
-            android:summary="Settings"
-            android:title="Video Settings"
+            android:summary="@string/settings"
+            android:title="@string/video_settings"
             android:key="videoprefcat">
         <ListPreference
                 android:entries="@array/gpuOptions"
                 android:entryValues="@array/gpuValues"
                 android:key="gpupref"
-                android:summary="Video backend to use"
-                android:title="Video Backend" />
+                android:summary="@string/video_backend_to_use"
+                android:title="@string/video_backend" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
index 76bc937489..6f4b8d3e5d 100644
--- a/Source/Android/res/layout/sidemenu.xml
+++ b/Source/Android/res/layout/sidemenu.xml
@@ -5,10 +5,6 @@
     android:gravity="left"
     android:orientation="vertical" >
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -26,6 +22,5 @@
                 android:textStyle="bold" />
 
         </LinearLayout>
-    </LinearLayout>
 
 </LinearLayout>
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
new file mode 100644
index 0000000000..329d464ccb
--- /dev/null
+++ b/Source/Android/res/values-ja/strings.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Title of the app -->
+    <string name="app_name">Dolphin Emulator</string>
+    
+    <!-- Navigation-related Strings -->
+    <string name="drawer_open">ナビゲーションウィンドウを開く</string>
+    <string name="drawer_close">ナビゲーションウィンドウを閉じる</string>
+    
+    <!-- About Fragment -->
+    <string name="build_revision">ビルドのバージョン：</string>
+    <string name="supports_gles3">サポートのOpenGL ES 3：</string>
+    
+    <!-- Folder Browser -->
+    <string name="current_dir">現在のディレクトリ： </string>
+    <string name="parent_directory">親ディレクトリ</string>
+    <string name="folder">フォルダ</string>
+    <string name="file_size">ファイルサイズ: </string>
+    <string name="cant_use_compressed_filetypes">圧縮ファイル形式はサポートされていません</string>
+    
+    <!-- Game List Activity -->
+    <string name="game_list">ゲームリスト</string>
+    <string name="browse_folder">フォルダの参照</string>
+    <string name="settings">設定</string>
+    <string name="gamepad_config">ゲームパッド設定</string>
+    <string name="about">について</string>
+    <string name="loading_browser">ファイルブラウザのロード</string>
+    <string name="loading_settings">設定のロード</string>
+    <string name="loading_gamepad">ゲームパッド設定のロード</string>
+    <string name="loading_about">メニューについてのロード</string>
+
+    <!-- Game List Fragment -->
+    <string name="file_clicked">クリックされたファイル： </string>
+    
+    <!-- Input Config Fragment -->
+    <string name="draw_onscreen_controls">画面上のコントロールを描画</string>
+    <string name="button_a">Aボタン</string>
+    <string name="button_b">Bボタン</string>
+    <string name="button_start">スタートボタン</string>
+    <string name="button_x">Xボタン</string>
+    <string name="button_y">Yボタン</string>
+    <string name="button_z">Zボタン</string>
+    <string name="dpad_up">D-Pad: ↑</string>
+    <string name="dpad_down">D-Pad: ↓</string>
+    <string name="dpad_left">D-Pad: ←</string>
+    <string name="dpad_right">D-Pad: →</string>
+    <string name="main_stick_up">コントロールスティック: ↑</string>
+    <string name="main_stick_down">コントロールスティック: ↓</string>
+    <string name="main_stick_left">コントロールスティック: ←</string>
+    <string name="main_stick_right">コントロールスティック: →</string>
+    <string name="c_stick_up">C-スティック: ↑</string>
+    <string name="c_stick_down">C-スティック: ↓</string>
+    <string name="c_stick_left">C-スティック: ←</string>
+    <string name="c_stick_right">C-スティック: →</string>
+    <string name="trigger_left">左のトリガー</string>
+    <string name="trigger_right">右のトリガー</string>
+    
+    <string name="not_drawing_onscreen_controls">コントロールは画面上に描画されていない</string>
+    <string name="drawing_onscreen_controls">コントロールは画面上に描画されています</string>
+    <string name="press_button_to_config">%1$sを設定するにはボタンを押して</string>   
+    
+    <!-- Prefs Fragment -->
+    <string name="interpreter">Interpreter</string>
+    <string name="jit64_recompiler">JIT64 Recompiler</string>
+    <string name="jitil_recompiler">JITIL Recompiler</string>
+    <string name="jit_arm_recompiler">JIT ARM Recompiler</string>
+    <string name="cpu_core">CPUコア</string>
+    <string name="cpu_settings">CPU設定</string>
+    <string name="emu_core_to_use">使用するエミュレーションコア</string>
+    <string name="dual_core">デュアルコア</string>
+    <string name="on_off">有効/無効</string>
+    
+    <string name="video_settings">ビデオ設定</string>
+    <string name="software_renderer">Software Renderer</string>
+    <string name="video_backend">ビデオレンダラ</string>
+    <string name="video_backend_to_use">使用するビデオレンダラー</string>
+    
+    <!-- Miscellaneous -->
+    <string name="yes">はい</string>
+    <string name="no">いいえ</string>
+
+</resources>
diff --git a/Source/Android/res/values/prefvalues.xml b/Source/Android/res/values/prefvalues.xml
index 409666e328..8564801f6f 100644
--- a/Source/Android/res/values/prefvalues.xml
+++ b/Source/Android/res/values/prefvalues.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="gpuOptions">
+    <string-array name="gpuOptions" translatable="false">
         <item>Software Renderer</item>
         <item>OpenGL ES 3</item>
     </string-array>
 
-    <string-array name="gpuValues">
+    <string-array name="gpuValues" translatable="false">
         <item>Software Renderer</item>
         <item>OGL</item>
     </string-array>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 40a14e3b4e..ea1e02297a 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -1,8 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- Title of the app -->
     <string name="app_name">Dolphin Emulator</string>
+    
+    <!-- Navigation-related Strings -->
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
+    
+    <!-- About Fragment -->
+    <string name="build_revision">Build Revision:</string>
+    <string name="supports_gles3">Supports OpenGL ES 3:</string>
+    
+    <!-- Folder Browser -->
+    <string name="current_dir">Current Dir: </string>
+    <string name="parent_directory">Parent Directory</string>
+    <string name="folder">Folder</string>
+    <string name="file_size">File Size: </string>
+    <string name="cant_use_compressed_filetypes">Can not use compressed file types</string>
+    
+    <!-- Game List Activity -->
+    <string name="game_list">Game List</string>
+    <string name="browse_folder">Browse Folder</string>
+    <string name="settings">Settings</string>
+    <string name="gamepad_config">Gamepad Config</string>
+    <string name="about">About</string>
+    <string name="loading_browser">Loading up the browser</string>
+    <string name="loading_settings">Loading up settings</string>
+    <string name="loading_gamepad">Loading up gamepad config</string>
+    <string name="loading_about">Loading about menu</string>
+
+    <!-- Game List Fragment -->
+    <string name="file_clicked">File clicked: </string>
+    
+    <!-- Input Config Fragment -->
+    <string name="draw_onscreen_controls">Draw on-screen controls</string>
+    <string name="button_a">Button A</string>
+    <string name="button_b">Button B</string>
+    <string name="button_start">Button Start</string>
+    <string name="button_x">Button X</string>
+    <string name="button_y">Button Y</string>
+    <string name="button_z">Button Z</string>
+    <string name="dpad_up">D-Pad Up</string>
+    <string name="dpad_down">D-Pad Down</string>
+    <string name="dpad_left">D-Pad Left</string>
+    <string name="dpad_right">D-Pad Right</string>
+    <string name="main_stick_up">Main Stick Up</string>
+    <string name="main_stick_down">Main Stick Down</string>
+    <string name="main_stick_left">Main Stick Left</string>
+    <string name="main_stick_right">Main Stick Right</string>
+    <string name="c_stick_up">C Stick Up</string>
+    <string name="c_stick_down">C Stick Down</string>
+    <string name="c_stick_left">C Stick Left</string>
+    <string name="c_stick_right">C Stick Right</string>
+    <string name="trigger_left">Trigger L</string>
+    <string name="trigger_right">Trigger R</string>
+    
+    <string name="not_drawing_onscreen_controls">Not drawing on-screen controls</string>
+    <string name="drawing_onscreen_controls">Drawing on-screen controls</string>
+    <string name="press_button_to_config">Press button to configure %1$s</string>
+    
+    <!-- Prefs Fragment -->
+    <string name="interpreter">Interpreter</string>
+    <string name="jit64_recompiler">JIT64 Recompiler</string>
+    <string name="jitil_recompiler">JITIL Recompiler</string>
+    <string name="jit_arm_recompiler">JIT ARM Recompiler</string>
+    <string name="cpu_core">CPU Core</string>
+    <string name="cpu_settings">CPU Settings</string>
+    <string name="emu_core_to_use">Emulation core to use</string>
+    <string name="dual_core">Dual Core</string>
+    <string name="on_off">On/Off</string>
+    
+    <string name="video_settings">Video Settings</string>
+    <string name="software_renderer">Software Renderer</string>
+    <string name="video_backend">Video Backend</string>
+    <string name="video_backend_to_use">Video backend to use</string>
+    
+    <!-- Miscellaneous -->
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
 
 </resources>