Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -297,7 +297,7 @@ no = No
 info.title = Info
 error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
-blocks.unknown=[LIGHT_GRAY]???
+blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Block Info
 blocks.powercapacity = Power Capacity
 blocks.powershot = Power/Shot
@@ -540,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

core/assets/bundles/bundle_zh_TW.properties

@@ -11,20 +11,20 @@ link.google-play.description = Google Play 商店頁面
 link.wiki.description = 官方 Mindustry 維基
 linkfail = 無法打開連結！\n我們已將該網址複製到您的剪貼簿。
 screenshot = 截圖保存到{0}
-gameover = 核心已被摧毀。
+gameover = 遊戲結束
 gameover.pvp = [accent]{0}[]隊獲勝！
 highscore = [accent]新的高分紀錄！
-stat.wave = Waves Defeated:[accent] {0}
+stat.wave = 打敗的波次：[accent]{0}
-stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
+stat.enemiesDestroyed = 摧毀的敵人：[accent]{0}
-stat.built = Buildings Built:[accent] {0}
+stat.built = 建設的建築：[accent]{0}
-stat.destroyed = Buildings Destroyed:[accent] {0}
+stat.destroyed = 摧毀的建築：[accent]{0}
-stat.deconstructed = Buildings Deconstructed:[accent] {0}
+stat.deconstructed = 移除的建築：[accent]{0}
-stat.delivered = Resources Launched:
+stat.delivered = 發射的資源：
 map.delete = 確認要刪除「[accent]{0}[]」地圖嗎？
 level.highscore = 最高分：[accent]{0}
 level.select = 選擇關卡
 level.mode = 遊戲模式：
-construction.desktop = 電腦控制已更改。\n要取消選擇或停止建設，[accent]按空格鍵[]。
+construction.desktop = 要取消選擇或停止建設，[accent]按空格鍵[]。
 construction.title = 方塊建設指南
 construction = 你選擇了[accent]方塊建設模式[]。\n\n要放置方塊，點擊你的船附近的有效位置。\n選擇了方塊後，點擊複選框就會開始建設。\n\n- 點擊方塊以從選擇區[accent]移除方塊[]。\n- 按住並拖動以[accent]直線放置方塊[]。\n- 點擊左下角的「X」以[accent]取消建設或取消選擇[]。
 deconstruction.title = 方塊移除指南
@@ -52,10 +52,10 @@ noname = 先選擇一個[accent]玩家名稱[]。
 filename = 檔案名稱︰
 unlocked = 新方塊已解鎖！
 completed = [accent]Completed
-techtree = Tech Tree
+techtree = 科技樹
-research.list = [LIGHT_GRAY]Research:
+research.list = [LIGHT_GRAY]研究︰
-research = Research
+research = 研究
-researched = [LIGHT_GRAY]{0} researched.
+researched = [LIGHT_GRAY]{0}研究完成。
 players = {0}個線上玩家
 players.single = {0}個線上玩家
 server.closing = [accent]正在關閉伺服器……
@@ -69,7 +69,7 @@ server.kicked.nameInUse = 伺服器中已經\n有人有相同的名稱了。
 server.kicked.nameEmpty = 你的名稱必須至少包含一個字母或數字。
 server.kicked.idInUse = 你已經在伺服器中！不允許用兩個賬號。
 server.kicked.customClient = 這個伺服器不支持自訂客戶端，請下載官方版本。
-server.kicked.gameover = Game over!
+server.kicked.gameover = 遊戲結束！
 host.info = 目前伺服器監聽於連接埠[scarlet]6567[]。\n所有跟您在同一個[LIGHT_GRAY]網路或區域網路[]環境的玩家應該能在他們的伺服器清單中找到您的伺服器。\n\n如果您希望網際網路上的玩家透過IP 位址連線到您的伺服器，您必須設定[accent]連接埠轉發[]。\n\n[LIGHT_GRAY]注意：如果區域網路內有玩家無法連線至您的伺服器，請務必確認您已於防火牆設定中開放Mindustry存取您的區域網路。
 join.info = 您可以在此輸入欲連線的[accent]伺服器的IP位址[]，或尋找[accent]區域網路[]內的伺服器。目前支援區域網路與網際網路連線。\n\n[LIGHT_GRAY]注意：這裡沒有網際網路伺服器清單，如果您想透過IP位址連線到某人的伺服器，您必須向他們詢問IP位址。
 hostserver = 建立伺服器
@@ -240,17 +240,17 @@ tutorial = 教學
 editor = 地圖編輯器
 mapeditor = 地圖編輯器
 donate = 贊助
-abandon = Abandon
+abandon = 放棄
-abandon.text = This zone and all its resources will be lost to the enemy.
+abandon.text = 此區域及其所有資源將會丟失給敵人。
-locked = Locked
+locked = 鎖定
-complete = [LIGHT_GRAY]Complete:
+complete = [LIGHT_GRAY]完成：
-resume = Resume Zone:\n[LIGHT_GRAY]{0}
+resume = 繼續區域：\n[LIGHT_GRAY]{0}
-bestwave = [LIGHT_GRAY]Best: {0}
+bestwave = [LIGHT_GRAY]高分：{0}
-launch = Launch
+launch = 發射
-launch.title = Launch Successful
+launch.title = 發射成功
+zone.unlocked = [LIGHT_GRAY]{0}已解鎖。
 launch.next = [LIGHT_GRAY]next opportunity at wave {0}
 launch.unable = [scarlet]Unable to LAUNCH.[] Enemies.
-zone.unlocked = [LIGHT_GRAY]{0} unlocked.
 connectfail = [crimson]無法連線到伺服器：[accent]{0}
 error.unreachable = 無法到達伺服器。
 error.invalidaddress = 無效地址。
@@ -258,7 +258,7 @@ error.timedout = 超時連接！\n確保伺服器設置了連接埠轉發，並
 error.mismatch = 包裹錯誤：\n客戶端/伺服器版本可能不匹配。 n確保客戶端和伺服器有最新版本的Mindustry！
 error.alreadyconnected = 已連接。
 error.mapnotfound = 找不到地圖！
-error.io = Network I/O error.
+error.io = 網絡輸入輸出錯誤。
 error.any = 未知網絡錯誤。
 zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
@@ -284,13 +284,13 @@ settings.clear.confirm = 您確定要清除數據嗎?\n此操作無法撤回！
 settings.clearall.confirm = [scarlet]警告！[]\n這將清除所有數據，包括存檔、地圖、解鎖和熱鍵綁定。\n按「是」後，遊戲將刪除所有數據並自動退出。
 settings.clearunlocks = 清除已解鎖
 settings.clearall = 清除所有
-paused = 已暫停
+paused = [accent]〈已暫停〉
 yes = 是
 no = 否
 info.title = [accent]資訊
 error.title = [crimson]發生錯誤
 error.crashtitle = 發生錯誤
-blocks.unknown = [LIGHT_GRAY]???
+blocks.unknown = [LIGHT_GRAY]？？？
 blocks.blockinfo = 方塊資訊
 blocks.powercapacity = 蓄電量
 blocks.powershot = 能量/射擊
@@ -427,7 +427,7 @@ mode.attack.descrption = No waves, with the goal to destroy the enemy base.
 content.item.name = 物品
 content.liquid.name = 液體
 content.unit.name = 機組
-content.block.name = Blocks
+content.block.name = 方塊
 content.mech.name = 機甲
 item.copper.name = 銅
 item.copper.description = 一種有用的結構材料。在各種類型的方塊中廣泛使用。
@@ -435,7 +435,7 @@ item.lead.name = 鉛
 item.lead.description = 一種基本的起始材料。被廣泛用於電子設備和運輸液體方塊。
 item.coal.name = 煤
 item.coal.description = 一種常見並容易獲得的燃料。
-item.graphite.name = Graphite
+item.graphite.name = 石墨
 item.titanium.name = 鈦
 item.titanium.description = 一種罕見的超輕金屬，被廣泛運用於運輸液體、鑽頭和飛機。
 item.thorium.name = 釷
@@ -456,10 +456,10 @@ item.blast-compound.name = 爆炸混合物
 item.blast-compound.description = 一種用於炸彈和炸藥的揮發性混合物。雖然它可以作為燃料燃燒，但不建議這樣做。
 item.pyratite.name = 硫
 item.pyratite.description = 一種在燃燒武器中使用的極易燃物質。
-item.metaglass.name = Metaglass
+item.metaglass.name = 金屬玻璃
-item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
+item.metaglass.description = 一種超級強硬玻璃混合物。廣泛用於液體分配和存儲。
-item.scrap.name = Scrap
+item.scrap.name = 廢料
-item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
+item.scrap.description = 舊結構和單位的遺留剩餘物。含有痕量的許多不同的金屬。
 liquid.water.name = 水
 liquid.lava.name = 岩漿
 liquid.oil.name = 原油
@@ -645,7 +645,8 @@ block.rtg-generator.name = 放射性同位素熱發電機
 block.spectre.name = 幽靈炮
 block.meltdown.name = 熔毀炮
 block.container.name = 容器
-block.launch-pad.name = Launch Pad
+block.core.description = 遊戲中最重要的建築。
+block.launch-pad.name = 發射台
 team.blue.name = 藍
 team.red.name = 紅
 team.orange.name = 橙