From 0d6446de14bc1f1c1101fb8ac1a0f17f49b3bcbf Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Mon, 3 Aug 2020 17:52:12 +0300
Subject: [PATCH 1/5] Translation patches (XML)

---
 app/src/main/res/layout/launcher_main.xml | 42 +++++++++++------------
 app/src/main/res/values-pl/strings.xml    |  2 +-
 app/src/main/res/values-ru/strings.xml    | 29 ++++++++++------
 app/src/main/res/values/strings.xml       |  9 ++++-
 4 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/app/src/main/res/layout/launcher_main.xml b/app/src/main/res/layout/launcher_main.xml
index 0a49620ce..c3f8f377c 100644
--- a/app/src/main/res/layout/launcher_main.xml
+++ b/app/src/main/res/layout/launcher_main.xml
@@ -77,13 +77,13 @@
 						android:orientation="horizontal">
 
 						<TextView
-							android:layout_height="match_parent"
-							android:text="Version:"
-							android:textAppearance="?android:attr/textAppearanceMedium"
 							android:id="@+id/lMTVVer"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
 							android:gravity="center"
-							android:textSize="12sp"
-							android:layout_width="wrap_content"/>
+							android:text="@string/main_version_"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textSize="12sp" />
 
 						<Spinner
 							android:layout_width="match_parent"
@@ -93,24 +93,24 @@
 					</LinearLayout>
 
 					<Button
+						style="?android:attr/buttonBarButtonStyle"
 						android:layout_width="match_parent"
 						android:layout_height="40dp"
-						android:text="Options"
 						android:onClick="launcherMenu"
-						style="?android:attr/buttonBarButtonStyle"/>
+						android:text="@string/main_options" />
 
 				</LinearLayout>
 
 				<com.kdt.mcgui.MineButton
-					android:layout_toRightOf="@id/lMTVVer"
-					android:layout_toLeftOf="@id/launcherMainLeftLayout"
+					android:id="@+id/launcherMainPlayButton"
 					android:layout_width="wrap_content"
 					android:layout_height="80dp"
-					android:text="Play"
 					android:layout_alignParentBottom="true"
+					android:layout_margin="5dp"
+					android:layout_toLeftOf="@id/launcherMainLeftLayout"
+					android:layout_toRightOf="@id/lMTVVer"
 					android:onClick="launchGame"
-					android:id="@+id/launcherMainPlayButton"
-					android:layout_margin="5dp"/>
+					android:text="@string/main_play" />
 
 				<LinearLayout
 					android:id="@+id/launcherMainRightLayout"
@@ -129,10 +129,10 @@
 						<TextView
 							android:layout_width="wrap_content"
 							android:layout_height="20dp"
-							android:text="Welcome,"
 							android:layout_marginRight="4dp"
-							android:textSize="12sp"
-							android:gravity="center"/>
+							android:gravity="center"
+							android:text="@string/main_welcome"
+							android:textSize="12sp" />
 
 						<TextView
 							android:layout_width="wrap_content"
@@ -160,20 +160,20 @@
 						android:layout_height="wrap_content">
 
 						<Button
+							style="?android:attr/buttonBarButtonStyle"
 							android:layout_width="88dp"
 							android:layout_height="40dp"
-							android:text="Info (DEV)"
-							android:textSize="10sp"
 							android:onClick="mcaccSwitchUser"
-							style="?android:attr/buttonBarButtonStyle"/>
+							android:text="@string/main_infodev"
+							android:textSize="10sp" />
 
 						<Button
+							style="?android:attr/buttonBarButtonStyle"
 							android:layout_width="match_parent"
 							android:layout_height="40dp"
-							android:text="Switch user"
-							android:textSize="10sp"
 							android:onClick="mcaccLogout"
-							style="?android:attr/buttonBarButtonStyle"/>
+							android:text="@string/main_switchuser"
+							android:textSize="10sp" />
 
 					</LinearLayout>
 
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 44452b81c..aca786817 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -183,5 +183,5 @@
 	
 	<!-- Update part (unused now) -->
 	<string name="update_console">Zaktualizuj konsolę</string>
-	
+
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 919f715a1..7d9cac3ab 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -70,8 +70,7 @@
 	<!-- MCLauncherActivity: Tabs -->
 	<string name="mcl_tab_news">Новости</string>
 	<string name="mcl_tab_console">Терминал разработчика</string>
-	<string name="mcl_tab_crash">Crash log</string>
-	
+
 	<!-- MCLauncherActivity: Strings -->
 	<string name="mcl_version_msg">Готовы к запуску Minecraft %s</string>
 	<string name="mcl_launch_cleancache">Удаляем временные файлы</string>
@@ -95,17 +94,16 @@
 	<string name="mcl_setting_subtitle_setmaxdxref">Увеличьте, если возникает ошибка при конвертации из-за большого количества ссылок. Рекомендуемое значение: 4096 или 8192.</string>
 	<string name="mcl_setting_title_freeform">Запуск Minecraft в режиме Freeform</string>
 	<string name="mcl_setting_subtitle_freeform">Запуск Minecraft в оконном режиме. Требуется Android 7.0+</string>
-	<string name="mcl_setting_title_longpresstrigger">How long will trigger after long press</string>
-	<string name="mcl_setting_subtitle_longpresstrigger">Change trigger time for long press in destroy block and drop item.</string>
+	<string name="mcl_setting_subtitle_longpresstrigger">Изменить время длинного нажатия для ломания и выбрасывания</string>
 	<string name="mcl_setting_title_controlsize">Размер кнопок</string>
 	<string name="mcl_setting_title_forgetoptifpath">Заставить OptiFine не находить самого себя</string>
 	<string name="mcl_setting_subtitle_forgetoptifpath">Позволяет заработать OptiFine на некоторых устройствах.</string>
 	<string name="mcl_setting_category_general">Основные настройки</string>
 	<string name="mcl_setting_category_veroption">Тип версии будет показан в списке версий</string>
-	<string name="mcl_setting_veroption_release">Release</string>
-	<string name="mcl_setting_veroption_snapshot">Snapshot</string>
-	<string name="mcl_setting_veroption_oldalpha">Old-alpha</string>
-	<string name="mcl_setting_veroption_oldbeta">Old-beta</string>
+	<string name="mcl_setting_veroption_release">Стабильные</string>
+	<string name="mcl_setting_veroption_snapshot">Частые</string>
+	<string name="mcl_setting_veroption_oldalpha">Старые (Альфа)</string>
+	<string name="mcl_setting_veroption_oldbeta">Старые (Бета)</string>
 		
 	<string name="mcl_version_clone">Клонировать</string>
 	
@@ -188,6 +186,17 @@
 	<string name="customctrl_selectdefault">Выбрать раскладку по-умолчанию</string>
 	
 	<!-- Update part (unused now) -->
-	<string name="update_console">Update console</string>
-	
+	<string name="login_online_check_keeplogin">Запомнить меня</string>
+	<string name="login_offline_label">Войти как пират</string>
+	<string name="main_options">Опции</string>
+	<string name="main_play">Играть</string>
+	<string name="main_welcome">Добро пожаловать,</string>
+	<string name="main_infodev">Инфо (Р)</string>
+	<string name="main_switchuser">Сменить пользователя</string>
+	<string name="main_version_">Версия:</string>
+	<string name="mcl_setting_title_longpresstrigger">Сколько времени нужно держать кнопку</string>
+	<string name="mcl_tab_crash">Инфо о сбое</string>
+	<string name="update_console">Обновить консоль</string>
+	<string name="main_nocrash">Сбоев не обнаружено.</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 361130046..36e45cf8d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -191,5 +191,12 @@
 	
 	<!-- Update part (unused now) -->
 	<string name="update_console">Update console</string>
-	
+	<string name="main_options">Options</string>
+	<string name="main_play">Play</string>
+	<string name="main_welcome">Welcome,</string>
+	<string name="main_infodev">Info (DEV)</string>
+	<string name="main_switchuser">Switch user</string>
+	<string name="main_version_">Version:</string>
+	<string name="main_nocrash">No crash detected</string>
+
 </resources>

From 33dc73a98e7145a8a39d1f65d5ac33d049b2a830 Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Mon, 3 Aug 2020 17:56:55 +0300
Subject: [PATCH 2/5] RU: No log string

---
 app/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7d9cac3ab..dfe038f21 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -198,5 +198,5 @@
 	<string name="mcl_tab_crash">Инфо о сбое</string>
 	<string name="update_console">Обновить консоль</string>
 	<string name="main_nocrash">Сбоев не обнаружено.</string>
-
+        <string name="main_nolog">Данных нет.</string>
 </resources>

From 84d6ff85eb6c73578683942946bc6b81683eb4e2 Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Mon, 3 Aug 2020 17:57:43 +0300
Subject: [PATCH 3/5] EN: No log string

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 36e45cf8d..9851059ee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -198,5 +198,5 @@
 	<string name="main_switchuser">Switch user</string>
 	<string name="main_version_">Version:</string>
 	<string name="main_nocrash">No crash detected</string>
-
+        <string name="main_nolog">No log.</string>
 </resources>

From 6631a588cb555c302d272bf5f77c38d3cec4e080 Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Mon, 3 Aug 2020 18:00:26 +0300
Subject: [PATCH 4/5] Source code fixations

---
 .../main/java/net/kdt/pojavlaunch/PojavLoginActivity.java   | 6 ++++--
 .../net/kdt/pojavlaunch/mcfragments/ConsoleFragment.java    | 2 +-
 .../java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index e2e90c75e..97041c6ab 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -358,7 +358,6 @@ public class PojavLoginActivity extends AppCompatActivity
 	public void loginSavedAcc(View view)
 	{
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.login_select_account);
 
 		if (Tools.enableDevFeatures) {
 			/*
@@ -376,7 +375,7 @@ public class PojavLoginActivity extends AppCompatActivity
 		}
 		
 		builder.setPositiveButton(android.R.string.cancel, null);
-
+		builder.setTitle(this.getString(R.string.login_select_account));
 		final AlertDialog dialog = builder.create();
 
 		/*
@@ -387,6 +386,8 @@ public class PojavLoginActivity extends AppCompatActivity
 		lpHint.weight = 1;
 		lpFlv.weight = 1;
 		*/
+		dialog.setTitle(this.getString(R.string.login_select_account));
+		System.out.println("Setting title...");
 		LinearLayout dialay = new LinearLayout(this);
 		dialay.setOrientation(LinearLayout.VERTICAL);
 		TextView fhint = new TextView(this);
@@ -455,6 +456,7 @@ public class PojavLoginActivity extends AppCompatActivity
 		dialay.addView(flv);
 		
 		dialog.setView(dialay);
+		dialog.setTitle(this.getString(R.string.login_select_account));
 		dialog.show();
 	}
 	
diff --git a/app/src/main/java/net/kdt/pojavlaunch/mcfragments/ConsoleFragment.java b/app/src/main/java/net/kdt/pojavlaunch/mcfragments/ConsoleFragment.java
index e7cdd7ade..91d435188 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/mcfragments/ConsoleFragment.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/mcfragments/ConsoleFragment.java
@@ -20,7 +20,7 @@ public class ConsoleFragment extends Fragment
 
 		consoleView = (TextView) view.findViewById(R.id.lmaintabconsoleLogTextView);
 		consoleView.setTypeface(Typeface.MONOSPACE);
-		consoleView.setHint("No log");
+		consoleView.setHint(this.getText(R.string.main_nolog));
 		
 		return view;
     }
diff --git a/app/src/main/java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java b/app/src/main/java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java
index f6ff870da..80fe1cf22 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java
@@ -40,7 +40,7 @@ public class CrashFragment extends Fragment
 		
 		crashView = (TextView) getView().findViewById(R.id.lmaintabconsoleLogCrashTextView);
 		crashView.setTypeface(Typeface.MONOSPACE);
-		crashView.setHint("No crash detected.");
+		crashView.setText(this.getText(R.string.main_nocrash));
 		
 		//new File(crashPath).mkdirs();
 	}

From 3f11b01888747b03fa2834670701570941abfd5d Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Mon, 3 Aug 2020 18:04:33 +0300
Subject: [PATCH 5/5] One more fixation

---
 .../java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java b/app/src/main/java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java
index 80fe1cf22..70b1479bf 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java
@@ -40,7 +40,7 @@ public class CrashFragment extends Fragment
 		
 		crashView = (TextView) getView().findViewById(R.id.lmaintabconsoleLogCrashTextView);
 		crashView.setTypeface(Typeface.MONOSPACE);
-		crashView.setText(this.getText(R.string.main_nocrash));
+		crashView.setHint(this.getText(R.string.main_nocrash));
 		
 		//new File(crashPath).mkdirs();
 	}