Merge branch 'master' into patch-1

core/assets/bundles/bundle_in_ID.properties

@@ -21,6 +21,7 @@ gameover.pvp = Tim[accent] {0}[] menang!
 highscore = [accent]Rekor Baru!
 copied = Tersalin.
 indevpopup = [accent]v6[] saat ini dalam versi [accent]alpha[].\n[lightgray]Artinya:[]\n[scarlet]- Kampanye belum sepenuhnya selesai[]\n- Beberapa konten tidak tersedia\n - Beberapa [scarlet]Unit AI[] tidak sepenuhnya bekerja\n- Beberapa unit belum sepenuhnya selesai\n- Semua yang kamu lihat dapat berubah atau dihapus sewaktu-waktu.\n\nLaporkan bug atau crash di [accent]Github[].
+indev.notready = Bagian tersebut saat ini belum siap
 
 load.sound = Suara
 load.map = Peta
@@ -51,9 +52,10 @@ schematic.copy.import = Impor dari papan klip
 schematic.shareworkshop = Bagikan di Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Balik Skema
 schematic.saved = Skema telah disimpan.
-schematic.delete.confirm = Skema ini akan benar - benar dihapus
+schematic.delete.confirm = Skema ini akan benar-benar dihapus.
 schematic.rename = Ganti nama Skema
 schematic.info = {0}x{1}, {2} blok
+schematic.disabled = [scarlet]Skema dilarang[]\nAnda tidak diperbolehkan untuk menggunakan skema di [accent]peta[] atau [accent]server ini.
 
 stat.wave = Gelombang Terkalahkan:[accent] {0}
 stat.enemiesDestroyed = Musuh Terhancurkan:[accent] {0}
@@ -469,18 +471,11 @@ locked = Terkunci
 complete = [lightgray]Mencapai:
 requirement.wave = Capai gelombang {0} dalam {1}
 requirement.core = Hancurkan inti musuh dalam {0}
-requirement.unlock = Buka {0}
+requirement.research = Kembangkan {0}
 requirement.capture = Kuasai {0}
-resume = Lanjutkan Zona:\n[lightgray]{0}
 bestwave = [lightgray]Gelombang Terbaik: {0}
-#TODO fix/remove this
-launch = < MELUNCUR >
 launch.text = Luncurkan
-launch.title = Berhasil Meluncur
-launch.next = [lightgray]kesempatan berikutnya di gelombang {0}
-launch.unable2 = [scarlet]Tidak dapat MELUNCUR.[]
-launch.confirm = Ini akan meluncurkan semua sumber daya di inti.\nAnda tidak bisa kembali lagi ke tempat ini.
-launch.skip.confirm = Jika Anda lewati sekarang, Anda tidak akan dapat meluncur hingga gelombang berikutnya.
+campaign.multiplayer = While playing multiplayer in campaign, you can only research using items from [accent]your[] sectors, [scarlet]not[] the host's sector that you are on right now.\n\nTo get items to [accent]your[] sectors in multiplayer, use a [accent]launch pad[].
 uncover = Buka
 configure = Konfigurasi Muatan
 #TODO
@@ -488,6 +483,7 @@ loadout = Muatan
 resources = Sumber Daya
 bannedblocks = Balok yang dilarang
 addall = Tambah Semua
+launch.destination = Destination: {0}
 configure.invalid = Jumlah harus berupa angka diantara 0 dan {0}.
 zone.unlocked = [lightgray]{0} terbuka.
 zone.requirement.complete = Gelombang {0} terselesaikan:\nPersyaratan zona {1} tercapai.
@@ -520,6 +516,8 @@ sectors.production = Produksi:
 sectors.stored = Terisi:
 sectors.resume = Lanjutkan
 sectors.launch = Luncurkan
+sectors.select = Pilih
+sectors.nonelaunch = [lightgray]tidak ada
 
 #NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway
 sector.groundZero.name = Ground Zero
@@ -598,6 +596,7 @@ blocks.powerconnections = Koneksi Maksimal
 blocks.poweruse = Penggunaan Tenaga
 blocks.powerdamage = Tenaga/Pukulan
 blocks.itemcapacity = Kapasitas Item
+blocks.memorycapacity = Kapasitas Memori
 blocks.basepowergeneration = Basis Generasi Tenaga
 blocks.productiontime = Waktu Produksi
 blocks.repairtime = Waktu Memperbaiki Blok Penuh
@@ -615,6 +614,8 @@ blocks.inaccuracy = Jarak Melenceng
 blocks.shots = Tembakan
 blocks.reload = Tembakan/Detik
 blocks.ammo = Amunisi
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Membutuhkan Bor yang Lebih Baik
 bar.noresources = Sumber Daya Tidak Ditemukan
@@ -662,6 +663,7 @@ unit.persecond = /detik
 unit.perminute = /menit
 unit.timesspeed = x kecepatan
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = item
 unit.thousands = rb
 unit.millions = jt
@@ -789,6 +791,9 @@ keybind.diagonal_placement.name = Penaruhan Diagonal
 keybind.pick.name = Memilih Blok
 keybind.break_block.name = Menghancurkan Blok
 keybind.deselect.name = Batal Memilih
+keybind.pickupCargo.name = Muat Kargo
+keybind.dropCargo.name = Turunkan Kargo
+keybind.command.name = Perintah
 keybind.shoot.name = Menembak
 keybind.zoom.name = Perbesar
 keybind.menu.name = Menu
@@ -820,6 +825,7 @@ mode.custom = Pengaturan Modifikasi
 
 rules.infiniteresources = Sumber Daya Tak Terbatas
 rules.reactorexplosions = Ledakan Reaktor
+rules.schematic = Skema Diperbolehkan
 rules.wavetimer = Pengaturan Waktu Gelombang 
 rules.waves = Gelombang
 rules.attack = Mode Penyerangan
@@ -876,9 +882,11 @@ liquid.water.name = Air
 liquid.slag.name = Terak
 liquid.oil.name = Minyak
 liquid.cryofluid.name = Cairan Dingin
+
 item.explosiveness = [lightgray]Tingkat Keledakan: {0}%
 item.flammability = [lightgray]Tingkat Kebakaran: {0}%
 item.radioactivity = [lightgray]Tingkat Radioaktif: {0}%
+
 unit.health = [lightgray]Darah: {0}
 unit.speed = [lightgray]Kecepatan: {0}
 unit.weapon = [lightgray]Senjata: {0}
@@ -911,14 +919,20 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
 unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
 unit.scepter.name = Scepter
 unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
 
 block.resupply-point.name = Titik Pemasok Ulang
 block.parallax.name = Parallax
@@ -927,21 +941,21 @@ block.sand-boulder.name = Batu Pasir
 block.grass.name = Rumput
 block.slag.name = Slag
 block.salt.name = Garam
-block.saltrocks.name = Batu Garam
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Kerikil
 block.tendrils.name = Sulur
-block.sandrocks.name = Batu Pasir
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Cemara Spora
-block.sporerocks.name = Batu Spora
-block.rock.name = Batu
-block.snowrock.name = Batu Salju
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Pinus Salju
 block.shale.name = Serpihan
 block.shale-boulder.name = Serpihan Batu Besar
 block.moss.name = Lumut
 block.shrubs.name = Semak-Semak
 block.spore-moss.name = Lumut Spora
-block.shalerocks.name = Batu Serpihan
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Dinding Kepingan
 block.scrap-wall-large.name = Dinding Kepingan Besar 1
 block.scrap-wall-huge.name = Dinding Kepingan Besar 2
@@ -979,6 +993,7 @@ block.dune-wall.name = Dinding Pasir
 block.pine.name = Cemara
 block.dirt.name = Tanah
 block.dirt-wall.name = Dinding Tanah
+block.mud.name = Lumpur
 block.white-tree-dead.name = Pohon Putih Mati
 block.white-tree.name = Pohon Putih
 block.spore-cluster.name = Kumpulan Spora
@@ -997,7 +1012,6 @@ block.dark-metal.name = Besi Gelap
 block.basalt.name = Basal
 block.hotrock.name = Batu Panas
 block.magmarock.name = Batu Lahar
-block.cliffs.name = Tebing
 block.copper-wall.name = Dinding Tembaga
 block.copper-wall-large.name = Dinding Tembaga Besar
 block.titanium-wall.name = Dinding Titanium
@@ -1129,6 +1143,7 @@ block.hyper-processor.name = Prosesor Cepat
 block.logic-display.name = Tampilan Logika
 block.large-logic-display.name = Tampilan Logika Besar
 block.memory-cell.name = Sel Memori
+block.memory-bank.name = Bank Memori
 
 team.blue.name = biru
 team.crux.name = merah