diff --git a/assets/locales/isIC/Polyglot-100_isIC.json b/assets/locales/isIC/Polyglot-100_isIC.json index ebc3646b2..b7672bdf1 100644 --- a/assets/locales/isIC/Polyglot-100_isIC.json +++ b/assets/locales/isIC/Polyglot-100_isIC.json @@ -1343,7 +1343,7 @@ }, { "n": "GAME_INVENTORY", - "s": "Inventory" + "s": "Birgðir" }, { "n": "GAME_INVENTORY_AMMO", @@ -1371,11 +1371,11 @@ }, { "n": "GAME_INVENTORY_DROP", - "s": "Drop" + "s": "Drjúpa" }, { "n": "GAME_INVENTORY_ENCUMBRANCE", - "s": "Encumbrance" + "s": "Kvaðir" }, { "n": "GAME_INVENTORY_FULL", @@ -1399,7 +1399,7 @@ }, { "n": "GAME_INVENTORY_USE", - "s": "Use" + "s": "Nota" }, { "n": "GAME_INVENTORY_WEAPON", @@ -1691,15 +1691,15 @@ }, { "n": "MENU_CONTROLS_KEY", - "s": "Key" + "s": "Lykill" }, { "n": "MENU_CONTROLS_KEYBOARD", - "s": "Keyboard" + "s": "Lyklaborð" }, { "n": "MENU_CONTROLS_MOUSE", - "s": "Mouse" + "s": "Mús" }, { "n": "MENU_CONTROLS_MOUSE_SENSITIVITY", @@ -1715,7 +1715,7 @@ }, { "n": "MENU_CONTROLS_SCROLL", - "s": "Scroll" + "s": "Fletta" }, { "n": "MENU_CONTROLS_SHAKE", @@ -1899,15 +1899,15 @@ }, { "n": "MENU_IO_LOAD", - "s": "Load" + "s": "Hlaða" }, { "n": "MENU_IO_LOAD_GAME", - "s": "Load Game" + "s": "Hlaða leik " }, { "n": "MENU_IO_LOADING", - "s": "Loading..." + "s": "Hleður..." }, { "n": "MENU_IO_PLEASE_WAIT", @@ -1919,19 +1919,19 @@ }, { "n": "MENU_IO_SAVE", - "s": "Save" + "s": "Vista" }, { "n": "MENU_IO_SAVE_DATA", - "s": "Save data" + "s": "Vista gögn" }, { "n": "MENU_IO_SAVE_GAME", - "s": "Save Game" + "s": "Vista leik " }, { "n": "MENU_IO_SAVING", - "s": "Saving..." + "s": " Vistar..." }, { "n": "MENU_LABEL_AGE", @@ -1951,7 +1951,7 @@ }, { "n": "MENU_LABEL_BACK", - "s": "Back" + "s": "Til baka" }, { "n": "MENU_LABEL_BACKGROUND_MUSIC", @@ -1959,11 +1959,11 @@ }, { "n": "MENU_LABEL_CANCEL", - "s": "Cancel" + "s": "Hætta við" }, { "n": "MENU_LABEL_CLOSE", - "s": "Close" + "s": "Loka" }, { "n": "MENU_LABEL_CONFIRM_BUTTON", @@ -1971,11 +1971,11 @@ }, { "n": "MENU_LABEL_CONTINUE", - "s": "Continue" + "s": "Halda áfram " }, { "n": "MENU_LABEL_CONTINUE_QUESTION", - "s": "Continue?" + "s": "halda áfram?" }, { "n": "MENU_LABEL_CREDITS", @@ -1983,11 +1983,11 @@ }, { "n": "MENU_LABEL_DESKTOP", - "s": "Exit to Desktop" + "s": "Hætta á skrifborð " }, { "n": "MENU_LABEL_DESKTOP_QUESTION", - "s": "Exit to Desktop?" + "s": "Hætta á skrifborð?" }, { "n": "MENU_LABEL_DLC", @@ -2027,7 +2027,7 @@ }, { "n": "MENU_LABEL_GRAPHICS", - "s": "Graphics" + "s": "Grafík" }, { "n": "MENU_LABEL_IAP", @@ -2035,7 +2035,7 @@ }, { "n": "MENU_LABEL_LANGUAGE", - "s": "Language" + "s": "Tungumál" }, { "n": "MENU_LABEL_LEVEL", @@ -2063,7 +2063,7 @@ }, { "n": "MENU_LABEL_NEW_GAME", - "s": "New Game" + "s": "Nýr leikur" }, { "n": "MENU_LABEL_NEXT", @@ -2075,11 +2075,11 @@ }, { "n": "MENU_LABEL_NO", - "s": "No" + "s": "Nei" }, { "n": "MENU_LABEL_NO_CAPS", - "s": "NO" + "s": "NEI" }, { "n": "MENU_LABEL_NOPE", @@ -2143,7 +2143,7 @@ }, { "n": "MENU_LABEL_QUIT", - "s": "Quit" + "s": "Hætta" }, { "n": "MENU_LABEL_QUIT_CONFIRM", @@ -2151,7 +2151,7 @@ }, { "n": "MENU_LABEL_QUIT_QUESTION", - "s": "Quit?" + "s": "hætta?" }, { "n": "MENU_LABEL_REPLAY", @@ -2159,15 +2159,15 @@ }, { "n": "MENU_LABEL_RETURN", - "s": "Return" + "s": "Til baka" }, { "n": "MENU_LABEL_RETURN_MAIN", - "s": "Return to Main Menu" + "s": "Fara aftur í höfuðvalmyndina" }, { "n": "MENU_LABEL_RETURN_MAIN_QUESTION", - "s": "Return to Main Menu?" + "s": "Fara aftur í höfuðvalmyndina?" }, { "n": "MENU_LABEL_SHARE", @@ -2207,7 +2207,7 @@ }, { "n": "MENU_LABEL_WORLD", - "s": "World" + "s": "Heimur" }, { "n": "MENU_LABEL_YEAH", @@ -2215,11 +2215,11 @@ }, { "n": "MENU_LABEL_YES", - "s": "Yes" + "s": "Já" }, { "n": "MENU_LABEL_YES_CAPS", - "s": "YES" + "s": "JÁ" }, { "n": "MENU_LANGUAGE_DIRECTION", @@ -2335,7 +2335,7 @@ }, { "n": "MENU_OPTIONS", - "s": "Options" + "s": "Stillingar " }, { "n": "MENU_OPTIONS_ADVANCEDGRAPHICS", @@ -2399,7 +2399,7 @@ }, { "n": "MENU_OPTIONS_GRAPHICS", - "s": "Graphics Options" + "s": "Grafíkstillingar" }, { "n": "MENU_OPTIONS_HUD", diff --git a/assets/mods/basegame/locales/isIC/game.json b/assets/mods/basegame/locales/isIC/game.json index eb63349fe..91ee41864 100644 --- a/assets/mods/basegame/locales/isIC/game.json +++ b/assets/mods/basegame/locales/isIC/game.json @@ -10,5 +10,6 @@ "GAME_INVENTORY_BLOCKS" : "Blokkir", "GAME_INVENTORY_WALLS" : "Veggir", "CONTEXT_ITEM_TOOL_PLURAL" : "Verkfærar", - "GAME_INVENTORY_FAVORITES" : "Uppáhalds" + "GAME_INVENTORY_FAVORITES" : "Uppáhalds", + "GAME_INVENTORY_REGISTER": "Skrá" } \ No newline at end of file diff --git a/lib/TerrarumSansBitmap.jar b/lib/TerrarumSansBitmap.jar index 685d41de5..71292406b 100644 Binary files a/lib/TerrarumSansBitmap.jar and b/lib/TerrarumSansBitmap.jar differ diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index 8a8a11302..8c05cbe5a 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -485,7 +485,7 @@ public class App implements ApplicationListener { fontGame = new GameFontBase(FONT_DIR, false, true, false, Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest, false, - 256, false + 256, false, 0.5f, false ); Lang.invoke(); diff --git a/src/net/torvald/terrarum/langpack/Lang.kt b/src/net/torvald/terrarum/langpack/Lang.kt index c879910b7..619f763c1 100644 --- a/src/net/torvald/terrarum/langpack/Lang.kt +++ b/src/net/torvald/terrarum/langpack/Lang.kt @@ -59,7 +59,6 @@ object Lang { localesDir.listFiles().filter { it.isDirectory }.forEach { languageList.add(it.name) } // temporary filter - languageList.remove("isIC") languageList.remove("jakanaJP") for (lang in languageList) { diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt index 392fddb35..e743e1ffa 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt @@ -8,6 +8,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.TextureRegion import net.torvald.terrarum.App import net.torvald.terrarum.CommonResourcePool +import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.ui.Toolkit import net.torvald.terrarum.ui.UICanvas import net.torvald.terrarum.ui.UIItem @@ -35,8 +36,8 @@ class UIKeyboardControlPanel : UICanvas() { private val drawX = (App.scr.width - width) / 2 private val drawY = (App.scr.height - height) / 2 - internal val kbx = (App.scr.width - width) / 2 + 61 - internal val kby = (App.scr.height - height) / 2 + 95 + internal val kbx = drawX + 61 + internal val kby = drawY + 95 private val oneu = 28 private val onehalfu = 44 @@ -155,8 +156,12 @@ class UIKeyboardControlPanel : UICanvas() { // Toolkit.drawBoxBorder(batch, drawX, drawY, width, height) // batch.color = fillCol // Toolkit.fillArea(batch, drawX, drawY, width, height) - uiItems.forEach { it.render(batch, camera) } + + batch.color = Color.WHITE + val title = Lang["MENU_CONTROLS_KEYBOARD"] + App.fontGame.draw(batch, title, drawX.toFloat() + (width - App.fontGame.getWidth(title)) / 2, drawY.toFloat()) + } override fun doOpening(delta: Float) { diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt index 6141eca0f..c25c6c8f4 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt @@ -13,7 +13,7 @@ object UITitleRemoConYaml { */ private val menuBase = """ - MENU_OPTIONS - - MENU_OPTIONS_GRAPHICS + - MENU_LABEL_GRAPHICS - MENU_OPTIONS_CONTROLS : net.torvald.terrarum.modulebasegame.ui.UIKeyboardControlPanel - MENU_LABEL_LANGUAGE : net.torvald.terrarum.modulebasegame.ui.UITitleLanguage - MENU_MODULES : net.torvald.terrarum.ModOptionsHost