Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2018-11-21 11:00:58 -05:00
commit 51641cc704

View File

@ -62,7 +62,7 @@ text.mission.linknode = Reliez le transmetteur énergétique
text.mission.display = [accent]Mission:\n[LIGHT_GRAY]{0}
text.mission.mech = Changer de mécha[accent] {0}[]
text.mission.create = Créez[accent] {0}[]
text.none = <none>
text.none = <Vide>
text.close = Fermer
text.quit = Quitter
text.maps = Cartes
@ -491,7 +491,7 @@ text.mech.ability = [LIGHT_GRAY]Compétence: {0}
text.liquid.heatcapacity = [LIGHT_GRAY]Capacité Thermique {0}
text.liquid.viscosity = [LIGHT_GRAY]Viscosité: {0}
text.liquid.temperature = [LIGHT_GRAY]Température: {0}
block.constructing = {0}\n[LIGHT_GRAY](Constructing)
block.constructing = {0}\n[LIGHT_GRAY](En construction)
block.spawn.name = Générateur d'ennemi
block.core.name = Base
block.metalfloor.name = Sol en métal