TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-14 15:17:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #267 from PojavLauncherTeam/artdeell-patch-1

Browse Source 
Overall translation patches
This commit is contained in:
ArtDev 2020-08-03 18:16:33 +03:00 committed by GitHub
commit ce0125658a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@ -358,7 +358,6 @@ public class PojavLoginActivity extends AppCompatActivity
public void loginSavedAcc(View view) public void loginSavedAcc(View view)
{ {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.login_select_account);
if (Tools.enableDevFeatures) { if (Tools.enableDevFeatures) {
/* /*
@ -376,7 +375,7 @@ public class PojavLoginActivity extends AppCompatActivity
} }
builder.setPositiveButton(android.R.string.cancel, null); builder.setPositiveButton(android.R.string.cancel, null);
builder.setTitle(this.getString(R.string.login_select_account));
final AlertDialog dialog = builder.create(); final AlertDialog dialog = builder.create();
/* /*
@ -387,6 +386,8 @@ public class PojavLoginActivity extends AppCompatActivity
lpHint.weight = 1; lpHint.weight = 1;
lpFlv.weight = 1; lpFlv.weight = 1;
*/ */
dialog.setTitle(this.getString(R.string.login_select_account));
System.out.println("Setting title...");
LinearLayout dialay = new LinearLayout(this); LinearLayout dialay = new LinearLayout(this);
dialay.setOrientation(LinearLayout.VERTICAL); dialay.setOrientation(LinearLayout.VERTICAL);
TextView fhint = new TextView(this); TextView fhint = new TextView(this);
@ -455,6 +456,7 @@ public class PojavLoginActivity extends AppCompatActivity
dialay.addView(flv); dialay.addView(flv);
dialog.setView(dialay); dialog.setView(dialay);
dialog.setTitle(this.getString(R.string.login_select_account));
dialog.show(); dialog.show();
} }

2
app/src/main/java/net/kdt/pojavlaunch/mcfragments/ConsoleFragment.java
View File

@ -20,7 +20,7 @@ public class ConsoleFragment extends Fragment
consoleView = (TextView) view.findViewById(R.id.lmaintabconsoleLogTextView); consoleView = (TextView) view.findViewById(R.id.lmaintabconsoleLogTextView);
consoleView.setTypeface(Typeface.MONOSPACE); consoleView.setTypeface(Typeface.MONOSPACE);
consoleView.setHint("No log"); consoleView.setHint(this.getText(R.string.main_nolog));
return view; return view;
} }

2
app/src/main/java/net/kdt/pojavlaunch/mcfragments/CrashFragment.java
View File

@ -40,7 +40,7 @@ public class CrashFragment extends Fragment
crashView = (TextView) getView().findViewById(R.id.lmaintabconsoleLogCrashTextView); crashView = (TextView) getView().findViewById(R.id.lmaintabconsoleLogCrashTextView);
crashView.setTypeface(Typeface.MONOSPACE); crashView.setTypeface(Typeface.MONOSPACE);
crashView.setHint("No crash detected."); crashView.setHint(this.getText(R.string.main_nocrash));
//new File(crashPath).mkdirs(); //new File(crashPath).mkdirs();
} }

42
app/src/main/res/layout/launcher_main.xml
View File

@ -77,13 +77,13 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_height="match_parent"
android:text="Version:"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/lMTVVer" android:id="@+id/lMTVVer"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:textSize="12sp" android:text="@string/main_version_"
android:layout_width="wrap_content"/> android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="12sp" />
<Spinner <Spinner
android:layout_width="match_parent" android:layout_width="match_parent"
@ -93,24 +93,24 @@
</LinearLayout> </LinearLayout>
<Button <Button
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:text="Options"
android:onClick="launcherMenu" android:onClick="launcherMenu"
style="?android:attr/buttonBarButtonStyle"/> android:text="@string/main_options" />
</LinearLayout> </LinearLayout>
<com.kdt.mcgui.MineButton <com.kdt.mcgui.MineButton
android:layout_toRightOf="@id/lMTVVer" android:id="@+id/launcherMainPlayButton"
android:layout_toLeftOf="@id/launcherMainLeftLayout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="80dp" android:layout_height="80dp"
android:text="Play"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_margin="5dp"
android:layout_toLeftOf="@id/launcherMainLeftLayout"
android:layout_toRightOf="@id/lMTVVer"
android:onClick="launchGame" android:onClick="launchGame"
android:id="@+id/launcherMainPlayButton" android:text="@string/main_play" />
android:layout_margin="5dp"/>
<LinearLayout <LinearLayout
android:id="@+id/launcherMainRightLayout" android:id="@+id/launcherMainRightLayout"
@ -129,10 +129,10 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="20dp" android:layout_height="20dp"
android:text="Welcome,"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:textSize="12sp" android:gravity="center"
android:gravity="center"/> android:text="@string/main_welcome"
android:textSize="12sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -160,20 +160,20 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button <Button
style="?android:attr/buttonBarButtonStyle"
android:layout_width="88dp" android:layout_width="88dp"
android:layout_height="40dp" android:layout_height="40dp"
android:text="Info (DEV)"
android:textSize="10sp"
android:onClick="mcaccSwitchUser" android:onClick="mcaccSwitchUser"
style="?android:attr/buttonBarButtonStyle"/> android:text="@string/main_infodev"
android:textSize="10sp" />
<Button <Button
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:text="Switch user"
android:textSize="10sp"
android:onClick="mcaccLogout" android:onClick="mcaccLogout"
style="?android:attr/buttonBarButtonStyle"/> android:text="@string/main_switchuser"
android:textSize="10sp" />
</LinearLayout> </LinearLayout>

27
app/src/main/res/values-ru/strings.xml
View File

@ -70,7 +70,6 @@
<!-- MCLauncherActivity: Tabs --> <!-- MCLauncherActivity: Tabs -->
<string name="mcl_tab_news">Новости</string> <string name="mcl_tab_news">Новости</string>
<string name="mcl_tab_console">Терминал разработчика</string> <string name="mcl_tab_console">Терминал разработчика</string>
<string name="mcl_tab_crash">Crash log</string>
<!-- MCLauncherActivity: Strings --> <!-- MCLauncherActivity: Strings -->
<string name="mcl_version_msg">Готовы к запуску Minecraft %s</string> <string name="mcl_version_msg">Готовы к запуску Minecraft %s</string>
@ -95,17 +94,16 @@
<string name="mcl_setting_subtitle_setmaxdxref">Увеличьте, если возникает ошибка при конвертации из-за большого количества ссылок. Рекомендуемое значение: 4096 или 8192.</string> <string name="mcl_setting_subtitle_setmaxdxref">Увеличьте, если возникает ошибка при конвертации из-за большого количества ссылок. Рекомендуемое значение: 4096 или 8192.</string>
<string name="mcl_setting_title_freeform">Запуск Minecraft в режиме Freeform</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_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">Изменить время длинного нажатия для ломания и выбрасывания</string>
<string name="mcl_setting_subtitle_longpresstrigger">Change trigger time for long press in destroy block and drop item.</string>
<string name="mcl_setting_title_controlsize">Размер кнопок</string> <string name="mcl_setting_title_controlsize">Размер кнопок</string>
<string name="mcl_setting_title_forgetoptifpath">Заставить OptiFine не находить самого себя</string> <string name="mcl_setting_title_forgetoptifpath">Заставить OptiFine не находить самого себя</string>
<string name="mcl_setting_subtitle_forgetoptifpath">Позволяет заработать OptiFine на некоторых устройствах.</string> <string name="mcl_setting_subtitle_forgetoptifpath">Позволяет заработать OptiFine на некоторых устройствах.</string>
<string name="mcl_setting_category_general">Основные настройки</string> <string name="mcl_setting_category_general">Основные настройки</string>
<string name="mcl_setting_category_veroption">Тип версии будет показан в списке версий</string> <string name="mcl_setting_category_veroption">Тип версии будет показан в списке версий</string>
<string name="mcl_setting_veroption_release">Release</string> <string name="mcl_setting_veroption_release">Стабильные</string>
<string name="mcl_setting_veroption_snapshot">Snapshot</string> <string name="mcl_setting_veroption_snapshot">Частые</string>
<string name="mcl_setting_veroption_oldalpha">Old-alpha</string> <string name="mcl_setting_veroption_oldalpha">Старые (Альфа)</string>
<string name="mcl_setting_veroption_oldbeta">Old-beta</string> <string name="mcl_setting_veroption_oldbeta">Старые (Бета)</string>
<string name="mcl_version_clone">Клонировать</string> <string name="mcl_version_clone">Клонировать</string>
@ -188,6 +186,17 @@
<string name="customctrl_selectdefault">Выбрать раскладку по-умолчанию</string> <string name="customctrl_selectdefault">Выбрать раскладку по-умолчанию</string>
<!-- Update part (unused now) --> <!-- 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>
<string name="main_nolog">Данных нет.</string>
</resources> </resources>

9
app/src/main/res/values/strings.xml
View File

@ -191,5 +191,12 @@
<!-- Update part (unused now) --> <!-- Update part (unused now) -->
<string name="update_console">Update console</string> <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>
<string name="main_nolog">No log.</string>
</resources> </resources>