Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

This commit is contained in:
Anuken
2021-12-21 10:39:49 -05:00
12 changed files with 52 additions and 18 deletions

View File

@@ -1491,9 +1491,9 @@ block.incinerator.description = Vaporizes any item or liquid it receives.
block.power-void.description = Voids all power inputted. Sandbox only.
block.power-source.description = Infinitely outputs power. Sandbox only.
block.item-source.description = Infinitely outputs items. Sandbox only.
block.item-void.description = Destroys any items. Sandbox only.
block.item-void.description = Destroys inputted items. Sandbox only.
block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
block.liquid-void.description = Removes any liquids. Sandbox only.
block.liquid-void.description = Destroys inputted liquids. Sandbox only.
block.payload-source.description = Infinitely outputs payloads. Sandbox only.
block.payload-void.description = Destroys any payloads. Sandbox only.
block.copper-wall.description = Protects structures from enemy projectiles.

View File

@@ -860,7 +860,7 @@ category.items = Materialien
category.crafting = Erzeugung
category.function = Funktion
category.optional = Optionale Zusätze
setting.skipcoreanimation.name = Skip Core Launch/Land Animation
setting.skipcoreanimation.name = Kern Start- und Lande-Animation überspringen
setting.landscape.name = Landschaft sperren
setting.shadows.name = Schatten
setting.blockreplace.name = Automatische Blockvorschläge

View File

@@ -96,7 +96,7 @@ database.button = Database
savegame = Gravar Jogo
loadgame = Carregar Jogo
joingame = Entrar no Jogo
customgame = Jogo Customi-/nzado
customgame = Jogo Customizado
newgame = Novo Jogo
none = <nenhum>
none.found = [lightgray]<none found>
@@ -519,7 +519,7 @@ width = Largura:
height = Altura:
menu = Menu
play = Jogar
campaign = Campa-/nnha
campaign = Campannha
load = Carregar
save = Gravar
fps = FPS: {0}
@@ -528,7 +528,7 @@ tps = TPS: {0}
memory = Mem: {0}mb
memory2 = Mem:\n {0}mb +\n {1}mb
language.restart = Por favor, reinicie seu jogo para a tradução tomar efeito.
settings = Configu-/nrações
settings = Configurações
tutorial = Tutorial
tutorial.retake = Refazer Tutorial
editor = Editor