Merge branch 'master' of https://github.com/fallenstardust/YGOMobile-cn-ko-en

mobile/assets_en/data/conf/strings.conf

@@ -939,3 +939,6 @@
 !setname 0x128 Witchcrafter
 !setname 0x129 The Evil Eye
 !setname 0x12a Endymion
+!setname 0x12b Marincess
+!setname 0x12c Tenyi
+!setname 0x12d Simorgh
\ No newline at end of file

mobile/src/main/res/layout/dialog_deck_manager.xml

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <ListView
+        android:layout_width="100dp"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:layout_width="10dp"
+        android:layout_height="wrap_content" />
+
+    <ListView
+        android:layout_width="150dp"
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="bottom">
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="50dp"
+            android:background="@drawable/blue" />
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="50dp"
+            android:background="@drawable/blue" />
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="50dp"
+            android:background="@drawable/blue" />
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="50dp"
+            android:background="@drawable/red" />
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="50dp"
+            android:background="@drawable/red" />
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="50dp"
+            android:background="@drawable/red" />
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="50dp"
+            android:background="@drawable/blue" />
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="50dp"
+            android:background="@drawable/blue" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file