Merge branch 'master' into zh-TW

core/assets/bundles/bundle.properties

@@ -33,12 +33,15 @@ deconstruction.title = Block Deconstruction Guide
 deconstruction = You've just selected [accent]block deconstruction mode[].\n\nTo begin breaking, simply tap a block near your ship.\nOnce you have selected some blocks, press the checkbox to confirm, and your ship will begin de-constructing them.\n\n- [accent]Remove blocks[] from your selection by tapping them.\n- [accent]Remove blocks in an area[] by tapping and holding an empty spot, then dragging in a direction.\n- [accent]Cancel deconstruction or selection[] by pressing the X at the bottom left.
 showagain = Don't show again next session
 coreattack = < Core is under attack! >
+nearpoint = [[ [scarlet]LEAVE DROP POINT IMMEDIATELY[] ]\nannihilation imminent
+outofbounds = [[ OUT OF BOUNDS ]\n[]self-destruct in {0}
 database = Core Database
 savegame = Save Game
 loadgame = Load Game
 joingame = Join Game
 addplayers = Add/Remove Players
 customgame = Custom Game
+newgame = New Game
 none = <none>
 close = Close
 quit = Quit
@@ -246,8 +249,11 @@ locked = Locked
 complete = [LIGHT_GRAY]Complete:
 resume = Resume Zone:\n[LIGHT_GRAY]{0}
 bestwave = [LIGHT_GRAY]Best: {0}
-launch = Launch
+launch = < LAUNCH >
 launch.title = Launch Successful
+launch.next = [LIGHT_GRAY]next opportunity at wave {0}
+launch.unable = [scarlet]Unable to LAUNCH.[] Enemies.
+launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
 zone.unlocked = [LIGHT_GRAY]{0} unlocked.
 
 connectfail = [crimson]Failed to connect to server:\n\n[accent]{0}
@@ -266,7 +272,7 @@ zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
 zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact.name = Impact 0079
+zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
 zone.arcticDesert.name = Arctic Desert
 zone.dryWastes.name = Dry Wastes
@@ -321,12 +327,15 @@ blocks.liquidoutput = Liquid Output
 blocks.liquidoutputspeed = Liquid Output Speed
 blocks.liquiduse = Liquid Use
 blocks.coolant = Coolant
+blocks.liquid = Liquid
 blocks.coolantuse = Coolant Use
 blocks.inputliquidfuel = Fuel Liquid
 blocks.liquidfueluse = Liquid Fuel Use
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Health
+blocks.power = Power
+blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
@@ -334,6 +343,7 @@ blocks.inputfuel = Fuel
 blocks.fuelburntime = Fuel Burn Time
 blocks.inputcapacity = Input capacity
 blocks.outputcapacity = Output capacity
+blocks.ammo = Ammo
 unit.blocks = blocks
 unit.powersecond = power units/second
 unit.liquidsecond = liquid units/second
@@ -392,6 +402,7 @@ keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
 keybind.select.name = Select/Shoot
+keybind.pick.name = Pick Block
 keybind.break.name = Break
 keybind.deselect.name = Deselect
 keybind.shoot.name = Shoot
@@ -411,8 +422,8 @@ keybind.chat_scroll.name = Chat scroll
 keybind.drop_unit.name = Drop Unit
 keybind.zoom_minimap.name = Zoom minimap
 mode.help.title = Description of modes
-mode.waves.name = Waves
-mode.waves.description = The normal mode. Limited resources and automatic incoming waves.
+mode.survival.name = Survival
+mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = Sandbox
 mode.sandbox.description = Infinite resources and no timer for waves.
 mode.freebuild.name = Freebuild
@@ -458,7 +469,7 @@ item.metaglass.description = A super-tough glass compound. Extensively used for
 item.scrap.name = Scrap
 item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
 liquid.water.name = Water
-liquid.lava.name = Lava
+liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
 mech.alpha-mech.name = Alpha
@@ -493,11 +504,10 @@ mech.glaive-ship.weapon = Flame Repeater
 item.explosiveness = [LIGHT_GRAY]Explosiveness: {0}%
 item.flammability = [LIGHT_GRAY]Flammability: {0}%
 item.radioactivity = [LIGHT_GRAY]Radioactivity: {0}%
-item.fluxiness = [LIGHT_GRAY]Flux Power: {0}%
 unit.health = [LIGHT_GRAY]Health: {0}
 unit.speed = [LIGHT_GRAY]Speed: {0}
 mech.weapon = [LIGHT_GRAY]Weapon: {0}
-mech.armor = [LIGHT_GRAY]Armor: {0}
+mech.health = [LIGHT_GRAY]Health: {0}
 mech.itemcapacity = [LIGHT_GRAY]Item Capacity: {0}
 mech.minespeed = [LIGHT_GRAY]Mining Speed: {0}
 mech.minepower = [LIGHT_GRAY]Mining Power: {0}
@@ -505,9 +515,15 @@ mech.ability = [LIGHT_GRAY]Ability: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Heat Capacity: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
+block.kiln.name = Kiln
+block.kiln.description = Smelts sand and lead into metaglass. Requires small amounts of power.
+block.graphite-press.name = Graphite Press
+block.multi-press.name = Multi-Press
 block.constructing = {0} [LIGHT_GRAY](Constructing)
 block.spawn.name = Enemy Spawn
-block.core.name = Core
+block.core-shard.name = Core: Shard
+block.core-foundation.name = Core: Foundation
+block.core-nucleus.name = Core: Nucleus
 block.metalfloor.name = Metal Floor
 block.deepwater.name = deepwater
 block.water.name = water
@@ -516,7 +532,7 @@ block.tar.name = Tar
 block.blackstone.name = Black Stone
 block.stone.name = Stone
 block.dirt.name = Dirt
-block.sand.name = Sand
+block.sand.name = Dark Sand
 block.ice.name = Ice
 block.snow.name = Snow
 block.grass.name = Grass
@@ -524,6 +540,36 @@ block.shrub.name = Shrub
 block.rock.name = Rock
 block.blackrock.name = Black Rock
 block.icerock.name = icerock
+block.craters.name = Craters
+block.sand-water.name = Sand water
+block.char.name = Char
+block.holostone.name = Holo stone
+block.ice-snow.name = Ice Snow
+block.rocks.name = Rocks
+block.icerocks.name = Ice rocks
+block.snowrocks.name = Snow Rocks
+block.dunerocks.name = Dune Rocks
+block.pine.name = Pine
+block.white-tree-dead.name = White Tree Dead
+block.white-tree.name = White Tree
+block.spore-cluster.name = Spore Cluster
+block.stained-rocks.name = Stained Rocks
+block.stained-stone.name = Stained Stone
+block.stained-rocks-red.name = Stained Rocks Red
+block.stained-stone-red.name = Stained Stone Red
+block.stained-rocks-yellow.name = Stained Rocks Yellow
+block.stained-stone-yellow.name = Stained Stone Yellow
+block.stained-boulder.name = Stained Boulde
+block.metal-floor.name = Metal Floor
+block.metal-floor-1.name = Metal Floor 1
+block.metal-floor-2.name = Metal Floor 2
+block.metal-floor-3.name = Metal Floor 3
+block.metal-floor-5.name = Metal Floor 5
+block.metal-floor-damaged.name = Metal Floor Damaged
+block.ignarock.name = Igna Rock
+block.hotrock.name = Hot Rock
+block.magmarock.name = Magma Rock
+block.cliffs.name = Cliffs
 block.copper-wall.name = Copper Wall
 block.copper-wall-large.name = Large Copper Wall
 block.titanium-wall.name = Titanium Wall
@@ -560,17 +606,19 @@ block.separator.name = Separator
 block.centrifuge.name = Centrifuge
 block.power-node.name = Power Node
 block.power-node-large.name = Large Power Node
+block.surge-tower.name = Surge Tower
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
 block.turbine-generator.name = Turbine Generator
+block.differential-generator.name = Differential Generator
+block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
 block.pneumatic-drill.name = Pneumatic Drill
 block.laser-drill.name = Laser Drill
 block.water-extractor.name = Water Extractor
 block.cultivator.name = Cultivator
-block.alpha-mech-pad.name = Alpha Mech Pad
-block.dart-ship-pad.name = Dart Ship Pad
+block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad
@@ -635,7 +683,6 @@ block.rtg-generator.name = RTG Generator
 block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.container.name = Container
-block.core.description = The most important building in the game.
 block.launch-pad.name = Launch Pad
 team.blue.name = blue
 team.red.name = red
@@ -650,6 +697,7 @@ unit.phantom.name = Phantom Drone
 unit.phantom.description = An advanced drone unit. Automatically mines ores and repairs blocks. Significantly more effective than a spirit drone.
 unit.dagger.name = Dagger
 unit.dagger.description = A basic ground unit. Useful in swarms.
+unit.crawler.name = Crawler
 unit.titan.name = Titan
 unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets.
 unit.ghoul.name = Ghoul Bomber
@@ -659,7 +707,11 @@ unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.fortress.name = Fortress
 unit.fortress.description = A heavy artillery ground unit.
 unit.revenant.name = Revenant
-unit.revenant.description = A heavy laser platform.
+unit.eruptor.name = Eruptor
+unit.chaos-array.name = Chaos Array
+unit.eradicator.name = Eradicator
+unit.lich.name = Lich
+unit.reaper.name = Reaper
 tutorial.begin = Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
 tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
 tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.