restart required label

2026-03-07 20:31:51 +09:00 · 2021-10-06 14:54:40 +09:00
parent 5e867f7db3
commit 0b07e642b1
27 changed files with 56 additions and 28 deletions
--- a/assets/locales/bgBG/terrarum.json
+++ b/assets/locales/bgBG/terrarum.json
@@ -8,5 +8,6 @@
  "MENU_LABEL_RESET" : "Нулиране",
  "GAME_32BIT_WARNING1": "Изглежда, че използвате 32-битова версия на Java.",
  "GAME_32BIT_WARNING2": "Моля, изтеглете и инсталирайте най-новата 64-битова Java на:",
-  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "Изисква се рестартиране"
 }
--- a/assets/locales/csCZ/terrarum.json
+++ b/assets/locales/csCZ/terrarum.json
@@ -4,5 +4,6 @@
  "COPYRIGHT_GNU_GPL_3": "Šířen pod licencí GNU GPL 3",
  "APP_WARNING_HEALTH_AND_SAFETY": "POZOR-ZDRAVÍ A BEZPEČNOST",
  "MENU_LABEL_PRESS_START_SYMBOL": "Stiskněte >",
-  "MENU_MODULES" : "Moduly"
+  "MENU_MODULES" : "Moduly",
+  "MENU_LABEL_RESTART_REQUIRED": "Vyžaduje se restartování"
 }
--- a/assets/locales/daDK/terrarum.json
+++ b/assets/locales/daDK/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-SUNDHED OG SIKKERHED",
  "MENU_LABEL_PRESS_START_SYMBOL": "Tryk >",
  "MENU_MODULES" : "Moduler",
-  "MENU_LABEL_RESET" : "Nulstil"
+  "MENU_LABEL_RESET" : "Nulstil",
+  "MENU_LABEL_RESTART_REQUIRED": "Genstart er nødvendig"
 }
--- a/assets/locales/de/terrarum.json
+++ b/assets/locales/de/terrarum.json
@@ -9,5 +9,6 @@
  "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/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/de/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "Neustart erforderlich"
 }
--- a/assets/locales/elGR/terrarum.json
+++ b/assets/locales/elGR/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "ΠΡΟΣΟΧΗ-ΥΓΕΙΑ ΚΑΙ ΑΣΦΑΛΕΙΑ",
  "MENU_LABEL_PRESS_START_SYMBOL": "Πάτα >",
  "MENU_MODULES" : "Ενότητες",
-  "MENU_LABEL_RESET" : "Επανεκκίνηση"
+  "MENU_LABEL_RESET" : "Επανεκκίνηση",
+  "MENU_LABEL_RESTART_REQUIRED": "Απαιτείται επανεκκίνηση"
 }
--- a/assets/locales/en/terrarum.json
+++ b/assets/locales/en/terrarum.json
@@ -12,5 +12,6 @@
  "GAME_32BIT_WARNING1": "It looks like you’re running a 32-Bit version of Java.",
  "GAME_32BIT_WARNING2": "Please download and install the latest 64-Bit Java at:",
  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
-  "MENU_OPTION_STREAMERS_LAYOUT": "Chat Overlay Mode"
+  "MENU_OPTION_STREAMERS_LAYOUT": "Chat Overlay Mode",
+  "MENU_LABEL_RESTART_REQUIRED": "Restart Required"
 }
--- a/assets/locales/es/terrarum.json
+++ b/assets/locales/es/terrarum.json
@@ -9,5 +9,6 @@
  "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/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/es/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "Es necesario reiniciar"
 }
--- a/assets/locales/fiFI/terrarum.json
+++ b/assets/locales/fiFI/terrarum.json
@@ -8,5 +8,6 @@
  "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/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/fi/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "Uudelleenkäynnistys tarvitaan"
 }
--- a/assets/locales/frFR/terrarum.json
+++ b/assets/locales/frFR/terrarum.json
@@ -10,5 +10,6 @@
  "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/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/fr/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "Redémarrage requis"
 }
--- a/assets/locales/huHU/terrarum.json
+++ b/assets/locales/huHU/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "VIGYÁZAT-EGÉSZSÉGÜGYI ÉS BIZTONSÁGI",
  "MENU_LABEL_PRESS_START_SYMBOL": "Nyomd meg a >ot",
  "MENU_MODULES" : "Modulok",
-  "MENU_LABEL_RESET" : "Visszaállítás"
+  "MENU_LABEL_RESET" : "Visszaállítás",
+  "MENU_LABEL_RESTART_REQUIRED": "Újraindítás szükséges"
 }
--- a/assets/locales/isIC/terrarum.json
+++ b/assets/locales/isIC/terrarum.json
@@ -1,6 +1,6 @@
 {
  "MENU_LABEL_COPYRIGHT": "Höfundarréttur",
-  "COPYRIGHT_ALL_RIGHTS_RESERVED": "Öll réttindi áskilinn",
+  "COPYRIGHT_ALL_RIGHTS_RESERVED": "Allur réttur áskilinn",
  "COPYRIGHT_GNU_GPL_3": "Dreift samkvæmt GNU GPL 3",
  "APP_WARNING_HEALTH_AND_SAFETY": "VIÐVÖRUN-HEILBRIGÐI OG ÖRYGGI",
  "MENU_LABEL_PRESS_START_SYMBOL": "Ýttu >",
@@ -8,5 +8,6 @@
  "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/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "Endurræsingar krafist"
 }
--- a/assets/locales/it/terrarum.json
+++ b/assets/locales/it/terrarum.json
@@ -7,5 +7,6 @@
  "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/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/it/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "Riavvio necessario"
 }
--- a/assets/locales/jaJP/terrarum.json
+++ b/assets/locales/jaJP/terrarum.json
@@ -9,5 +9,6 @@
  "MENU_LABEL_RESET" : "リセット",
  "GAME_32BIT_WARNING1": "32ビットJavaを使用中のようです。",
  "GAME_32BIT_WARNING2": "下記のリンクから最新64ビットJavaをダウンロードしてインストールしてください。",
-  "GAME_32BIT_WARNING3": "https://www.java.com/ja/download/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/ja/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "再起動が必要"
 }
--- a/assets/locales/koKR/terrarum.json
+++ b/assets/locales/koKR/terrarum.json
@@ -11,5 +11,6 @@
  "GAME_32BIT_WARNING1": "32비트 버전의 Java를 사용중인 것 같습니다.",
  "GAME_32BIT_WARNING2": "아래 링크에서 최신 64비트 Java를 내려받아 설치해주세요.",
  "GAME_32BIT_WARNING3": "https://www.java.com/ko/download/",
-  "MENU_OPTION_STREAMERS_LAYOUT": "스트리머 채팅창 모드"
+  "MENU_OPTION_STREAMERS_LAYOUT": "스트리머 채팅창 모드",
+  "MENU_LABEL_RESTART_REQUIRED": "다시 시작 필요"
 }
--- a/assets/locales/nlNL/terrarum.json
+++ b/assets/locales/nlNL/terrarum.json
@@ -4,5 +4,6 @@
  "COPYRIGHT_GNU_GPL_3": "Gedistribueerd onder GNU GPL 3",
  "APP_WARNING_HEALTH_AND_SAFETY": "WAARSCHUWING-GEZONDHEID EN VEILIGHEID",
  "MENU_LABEL_PRESS_START_SYMBOL": "Druk op >",
-  "MENU_MODULES" : "Modules"
+  "MENU_MODULES" : "Modules",
+  "MENU_LABEL_RESTART_REQUIRED": "Opnieuw opstarten vereist"
 }
--- a/assets/locales/noNB/terrarum.json
+++ b/assets/locales/noNB/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-HELSE OG SIKKERHET",
  "MENU_LABEL_PRESS_START_SYMBOL": "Trykk >",
  "MENU_MODULES" : "Moduler",
-  "MENU_LABEL_RESET" : "Nullstill"
+  "MENU_LABEL_RESET" : "Nullstill",
+  "MENU_LABEL_RESTART_REQUIRED": "Omstart kreves"
 }
--- a/assets/locales/plPL/terrarum.json
+++ b/assets/locales/plPL/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "UWAGA-ZDROWIE I BEZPIECZEŃSTWO",
  "MENU_LABEL_PRESS_START_SYMBOL": "Naciśnij >",
  "MENU_MODULES" : "Moduły",
-  "MENU_LABEL_RESET" : "Reset"
+  "MENU_LABEL_RESET" : "Reset",
+  "MENU_LABEL_RESTART_REQUIRED": "Wymagane ponowne uruchomienie"
 }
--- a/assets/locales/ptBR/terrarum.json
+++ b/assets/locales/ptBR/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA",
  "MENU_LABEL_PRESS_START_SYMBOL": "Pressione >",
  "MENU_MODULES" : "Módulos",
-  "MENU_LABEL_RESET" : "Reiniciar"
+  "MENU_LABEL_RESET" : "Reiniciar",
+  "MENU_LABEL_RESTART_REQUIRED": "Reinicialização necessária"
 }
--- a/assets/locales/ptPT/terrarum.json
+++ b/assets/locales/ptPT/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA",
  "MENU_LABEL_PRESS_START_SYMBOL": "Carrega no >",
  "MENU_MODULES" : "Módulos",
-  "MENU_LABEL_RESET" : "Reiniciar"
+  "MENU_LABEL_RESET" : "Reiniciar",
+  "MENU_LABEL_RESTART_REQUIRED": "Reinício necessário"
 }
--- a/assets/locales/roRO/terrarum.json
+++ b/assets/locales/roRO/terrarum.json
@@ -4,5 +4,6 @@
  "COPYRIGHT_GNU_GPL_3": "Distribuit sub GNU GPL 3",
  "APP_WARNING_HEALTH_AND_SAFETY": "ATENȚIONARE-SĂNĂTATE ȘI SIGURANȚĂ",
  "MENU_LABEL_PRESS_START_SYMBOL": "Apasă >",
-  "MENU_MODULES" : "Module"
+  "MENU_MODULES" : "Module",
+  "MENU_LABEL_RESTART_REQUIRED": "Repornire necesară"
 }
--- a/assets/locales/ruRU/terrarum.json
+++ b/assets/locales/ruRU/terrarum.json
@@ -8,5 +8,6 @@
  "MENU_LABEL_RESET" : "Перезапустить",
  "GAME_32BIT_WARNING1": "Похоже, вы используете 32-разрядную версию Java.",
  "GAME_32BIT_WARNING2": "Загрузите и установите последнюю 64-разрядную версию Java по:",
-  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "Требуется перезапуск"
 }
--- a/assets/locales/svSE/terrarum.json
+++ b/assets/locales/svSE/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "VARNING-HÄLSA OCH SÄKERHET",
  "MENU_LABEL_PRESS_START_SYMBOL": "Tryck >",
  "MENU_MODULES" : "Moduler",
-  "MENU_LABEL_RESET" : "Återställ"
+  "MENU_LABEL_RESET" : "Återställ",
+  "MENU_LABEL_RESTART_REQUIRED": "Omstart krävs"
 }
--- a/assets/locales/thTH/terrarum.json
+++ b/assets/locales/thTH/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "คำเตือน-อนามัยและความปลอดภัย",
  "MENU_LABEL_PRESS_START_SYMBOL": "กดปุ่ม >",
  "MENU_MODULES" : "โมดูล",
-  "MENU_LABEL_RESET" : "รีเซ็ต"
+  "MENU_LABEL_RESET" : "รีเซ็ต",
+  "MENU_LABEL_RESTART_REQUIRED": "ต้องเริ่มระบบใหม่"
 }
--- a/assets/locales/trTR/terrarum.json
+++ b/assets/locales/trTR/terrarum.json
@@ -5,5 +5,6 @@
  "APP_WARNING_HEALTH_AND_SAFETY": "UYARI-SAĞLIK VE GÜVENLİK",
  "MENU_LABEL_PRESS_START_SYMBOL": "> basınız",
  "MENU_MODULES" : "Modüller",
-  "MENU_LABEL_RESET" : "Sıfırla"
+  "MENU_LABEL_RESET" : "Sıfırla",
+  "MENU_LABEL_RESTART_REQUIRED": "Yeniden başlatma gerekiyor "
 }
--- a/assets/locales/zhCN/terrarum.json
+++ b/assets/locales/zhCN/terrarum.json
@@ -13,5 +13,6 @@
  "MENU_LABEL_RESET" : "重置",
  "GAME_32BIT_WARNING1": "看起来您正在运行32位版本的Java。",
  "GAME_32BIT_WARNING2": "请下载并安装最新的64位Java :",
-  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "需要重新启动"
 }
--- a/assets/locales/zhTW/terrarum.json
+++ b/assets/locales/zhTW/terrarum.json
@@ -9,5 +9,6 @@
  "MENU_LABEL_RESET" : "重置",
  "GAME_32BIT_WARNING1": "看起來您正在運行32位版本的Java。",
  "GAME_32BIT_WARNING2": "請下載並安裝最新的64位Java :",
-  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/"
+  "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
+  "MENU_LABEL_RESTART_REQUIRED": "需要重新啟動"
 }
--- a/src/net/torvald/terrarum/modulebasegame/ui/GraphicsControlPanel.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/GraphicsControlPanel.kt
@@ -32,7 +32,8 @@ class GraphicsControlPanel : UICanvas() {
    private val options = arrayOf(
            arrayOf("fx_dither", "Dither"),
            arrayOf("fx_backgroundblur", "Blur"),
-            arrayOf("fx_streamerslayout", Lang["MENU_OPTION_STREAMERS_LAYOUT"])
+            arrayOf("fx_streamerslayout", Lang["MENU_OPTION_STREAMERS_LAYOUT"]),
+            arrayOf("usevsync", Lang["MENU_OPTIONS_VSYNC"]+"*")
    )

    private val togglers = options.mapIndexed { index, strings ->
@@ -70,6 +71,7 @@ class GraphicsControlPanel : UICanvas() {
            App.fontGame.draw(batch, strings[1], drawX + panelgap.toFloat(), drawY + panelgap + index * (20f + linegap))
        }
        uiItems.forEach { it.render(batch, camera) }
+        App.fontGame.draw(batch, "* ${Lang["MENU_LABEL_RESTART_REQUIRED"]}", drawX + panelgap.toFloat(), drawY + height - panelgap - App.fontGame.lineHeight)

        if (App.getConfigBoolean("fx_streamerslayout")) {
            val xstart = App.scr.width - App.scr.chatWidth