diff --git a/assets/locales/bgBG/terrarum.json b/assets/locales/bgBG/terrarum.json index a4a6c87e1..60751b1e6 100644 --- a/assets/locales/bgBG/terrarum.json +++ b/assets/locales/bgBG/terrarum.json @@ -5,5 +5,8 @@ "COPYRIGHT_ALL_RIGHTS_RESERVED": "Всички права запазени", "COPYRIGHT_GNU_GPL_3": "Разпределени под GNU GPL 3", "MENU_MODULES" : "Модули", - "MENU_LABEL_RESET" : "Нулиране" + "MENU_LABEL_RESET" : "Нулиране", + "GAME_32BIT_WARNING1": "Изглежда, че използвате 32-битова версия на Java.", + "GAME_32BIT_WARNING2": "Моля, изтеглете и инсталирайте най-новата 64-битова Java на:", + "GAME_32BIT_WARNING3": "https://www.java.com/en/download/" } \ No newline at end of file diff --git a/assets/locales/de/terrarum.json b/assets/locales/de/terrarum.json index 9485e46b1..64100553f 100644 --- a/assets/locales/de/terrarum.json +++ b/assets/locales/de/terrarum.json @@ -6,5 +6,8 @@ "MENU_LABEL_PRESS_START_SYMBOL": "Drücke >", "MENU_MODULES" : "Modulen", "GAME_ACTION_MOVE_VERB" : "Verschieben", - "MENU_LABEL_RESET" : "Zurücksetzen" + "MENU_LABEL_RESET" : "Zurücksetzen", + "GAME_32BIT_WARNING1": "Es sieht so aus, als ob Sie eine 32-Bit-Version von Java verwenden.", + "GAME_32BIT_WARNING2": "Bitte laden Sie das neueste 64-Bit Java herunter und installieren Sie es unter:", + "GAME_32BIT_WARNING3": "https://www.java.com/de/download/" } \ No newline at end of file diff --git a/assets/locales/es/terrarum.json b/assets/locales/es/terrarum.json index 609e538ba..9d39451d3 100644 --- a/assets/locales/es/terrarum.json +++ b/assets/locales/es/terrarum.json @@ -6,5 +6,8 @@ "MENU_LABEL_PRESS_START_SYMBOL": "Pulsa >", "MENU_MODULES" : "Módulos", "GAME_ACTION_MOVE_VERB" : "Mover", - "MENU_LABEL_RESET" : "Reiniciar" + "MENU_LABEL_RESET" : "Reiniciar", + "GAME_32BIT_WARNING1": "Parece que está ejecutando una versión de 32 bits de Java.", + "GAME_32BIT_WARNING2": "Descargue e instale la última versión de Java de 64 bits en:", + "GAME_32BIT_WARNING3": "https://www.java.com/es/download/" } \ No newline at end of file diff --git a/assets/locales/fiFI/terrarum.json b/assets/locales/fiFI/terrarum.json index 6a17979d1..87b897db2 100644 --- a/assets/locales/fiFI/terrarum.json +++ b/assets/locales/fiFI/terrarum.json @@ -5,5 +5,8 @@ "APP_WARNING_HEALTH_AND_SAFETY": "VAROITUS-TERVEYS JA TURVALLISUUS", "MENU_LABEL_PRESS_START_SYMBOL": "Paina >", "MENU_MODULES" : "Moduulit", - "MENU_LABEL_RESET" : "Nollaa" + "MENU_LABEL_RESET" : "Nollaa", + "GAME_32BIT_WARNING1": "Näyttää siltä, että käytössäsi on 32-bittinen Java-versio.", + "GAME_32BIT_WARNING2": "Lataa ja asenna uusin 64-bittinen Java osoitteesta:", + "GAME_32BIT_WARNING3": "https://www.java.com/fi/download/" } \ No newline at end of file diff --git a/assets/locales/frFR/terrarum.json b/assets/locales/frFR/terrarum.json index be8dd8821..2e8becccd 100644 --- a/assets/locales/frFR/terrarum.json +++ b/assets/locales/frFR/terrarum.json @@ -7,5 +7,8 @@ "MENU_MODULES" : "Modules", "GAME_ACTION_MOVE_VERB" : "Déplacer", "GAME_ACTION_ZOOM" : "Agrandir", - "MENU_LABEL_RESET" : "Réinitialiser" + "MENU_LABEL_RESET" : "Réinitialiser", + "GAME_32BIT_WARNING1": "Il semble que vous exécutiez une version 32 bits de Java.", + "GAME_32BIT_WARNING2": "Veuillez télécharger et installer la dernière version de Java 64 bits sur :", + "GAME_32BIT_WARNING3": "https://www.java.com/fr/download/" } \ No newline at end of file diff --git a/assets/locales/isIC/terrarum.json b/assets/locales/isIC/terrarum.json index 8b090a81b..e9f9a5e27 100644 --- a/assets/locales/isIC/terrarum.json +++ b/assets/locales/isIC/terrarum.json @@ -2,8 +2,11 @@ "MENU_LABEL_COPYRIGHT": "Höfundarréttur", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Öll réttindi áskilinn", "COPYRIGHT_GNU_GPL_3": "Dreift samkvæmt GNU GPL 3", - "APP_WARNING_HEALTH_AND_SAFETY": "VIÐVÖRUN-HEILSA OG ÖRYGGI", + "APP_WARNING_HEALTH_AND_SAFETY": "VIÐVÖRUN-HEILBRIGÐI OG ÖRYGGI", "MENU_LABEL_PRESS_START_SYMBOL": "Ýttu >", "MENU_MODULES" : "Einingar", - "GAME_ACTION_MOVE_VERB" : "Hreyfa" + "GAME_ACTION_MOVE_VERB" : "Hreyfa", + "GAME_32BIT_WARNING1": "Þú ert að keyra 32-bita útgáfu af Java.", + "GAME_32BIT_WARNING2": "Sæktu og settu upp nýjasta 64-bita Java á:", + "GAME_32BIT_WARNING3": "https://www.java.com/en/download/" } \ No newline at end of file diff --git a/assets/locales/it/terrarum.json b/assets/locales/it/terrarum.json index 4603ee2db..36e153230 100644 --- a/assets/locales/it/terrarum.json +++ b/assets/locales/it/terrarum.json @@ -4,5 +4,8 @@ "COPYRIGHT_GNU_GPL_3": "Distribuito sotto licenza GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ATTENZIONE-SALUTE E SICUREZZA", "MENU_LABEL_PRESS_START_SYMBOL": "Premi >", - "MENU_MODULES" : "Moduli" + "MENU_MODULES" : "Moduli", + "GAME_32BIT_WARNING1": "Sembra che tu stia eseguendo una versione a 32 bit di Java.", + "GAME_32BIT_WARNING2": "Si prega di scaricare e installare l'ultima versione di Java a 64 bit all'indirizzo:", + "GAME_32BIT_WARNING3": "https://www.java.com/it/download/" } \ No newline at end of file diff --git a/assets/locales/jaJP/terrarum.json b/assets/locales/jaJP/terrarum.json index e852bf7bc..1b52312d2 100644 --- a/assets/locales/jaJP/terrarum.json +++ b/assets/locales/jaJP/terrarum.json @@ -6,5 +6,8 @@ "MENU_LABEL_PRESS_START_SYMBOL": "> ボタンを押す", "MENU_MODULES" : "モジュール", "GAME_ACTION_MOVE_VERB" : "移動する", - "MENU_LABEL_RESET" : "リセット" + "MENU_LABEL_RESET" : "リセット", + "GAME_32BIT_WARNING1": "32ビットJavaを使用中のようです。", + "GAME_32BIT_WARNING2": "下記のリンクから最新64ビットJavaをダウンロードしてインストールしてください。", + "GAME_32BIT_WARNING3": "https://www.java.com/ja/download/" } \ No newline at end of file diff --git a/assets/locales/ruRU/terrarum.json b/assets/locales/ruRU/terrarum.json index 3baa27250..75da90c6c 100644 --- a/assets/locales/ruRU/terrarum.json +++ b/assets/locales/ruRU/terrarum.json @@ -5,5 +5,8 @@ "APP_WARNING_HEALTH_AND_SAFETY": "ПРЕДУПРЕЖДЕНИЕ-ЗДОРОВЬЕ И БЕЗОПАСНОСТЬ", "MENU_LABEL_PRESS_START_SYMBOL": "Нажмите >", "MENU_MODULES" : "Модули", - "MENU_LABEL_RESET" : "Перезапустить" + "MENU_LABEL_RESET" : "Перезапустить", + "GAME_32BIT_WARNING1": "Похоже, вы используете 32-разрядную версию Java.", + "GAME_32BIT_WARNING2": "Загрузите и установите последнюю 64-разрядную версию Java по:", + "GAME_32BIT_WARNING3": "https://www.java.com/en/download/" } \ No newline at end of file diff --git a/assets/locales/zhCN/terrarum.json b/assets/locales/zhCN/terrarum.json index ea2e10d6d..5a603b3bd 100644 --- a/assets/locales/zhCN/terrarum.json +++ b/assets/locales/zhCN/terrarum.json @@ -10,5 +10,8 @@ "MENU_LABEL_PRESS_START_SYMBOL": "按下 >", "MENU_MODULES" : "模块", "GAME_ACTION_MOVE_VERB" : "移动", - "MENU_LABEL_RESET" : "重置" + "MENU_LABEL_RESET" : "重置", + "GAME_32BIT_WARNING1": "看起来您正在运行32位版本的Java。", + "GAME_32BIT_WARNING2": "请下载并安装最新的64位Java :", + "GAME_32BIT_WARNING3": "https://www.java.com/en/download/" } \ No newline at end of file diff --git a/assets/locales/zhTW/terrarum.json b/assets/locales/zhTW/terrarum.json index 7d2f91c68..a27c661da 100644 --- a/assets/locales/zhTW/terrarum.json +++ b/assets/locales/zhTW/terrarum.json @@ -6,5 +6,8 @@ "MENU_LABEL_PRESS_START_SYMBOL": "按下 >", "MENU_MODULES" : "模塊", "GAME_ACTION_MOVE_VERB" : "移動", - "MENU_LABEL_RESET" : "重置" + "MENU_LABEL_RESET" : "重置", + "GAME_32BIT_WARNING1": "看起來您正在運行32位版本的Java。", + "GAME_32BIT_WARNING2": "請下載並安裝最新的64位Java :", + "GAME_32BIT_WARNING3": "https://www.java.com/en/download/" } \ No newline at end of file diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt index 2af602b71..d41ef6987 100644 --- a/src/net/torvald/terrarum/TitleScreen.kt +++ b/src/net/torvald/terrarum/TitleScreen.kt @@ -337,6 +337,7 @@ class TitleScreen(batch: SpriteBatch) : IngameInstance(batch) { batch.color = Color.WHITE if (App.is32BitJVM && uiRemoCon.currentRemoConContents.parent == null) { +// if (uiRemoCon.currentRemoConContents.parent == null) { val linegap = 4 val imgTxtGap = 10 val yoff = App.scr.height - App.scr.tvSafeGraphicsHeight - 64 - (3*(20+linegap)) - imgTxtGap - 9