Merge

core/assets/bundles/bundle_zh_CN.properties

@@ -335,17 +335,17 @@ no = 不
 info.title = [accent]详情
 error.title = [crimson]发生了一个错误
 error.crashtitle = 发生了一个错误
-blocks.outputspeed = 挖掘速度: {0}/s
-blocks.efficiency = 效率: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = 挖掘速度: {0}/s
+bar.efficiency = 效率: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = 方块详情
-blocks.powerbalance = 能量: {0}
-blocks.poweroutput = 能量输出: {0}
+bar.powerbalance = 能量: {0}
+bar.poweroutput = 能量输出: {0}
 blocks.powercapacity = 能量容量
 blocks.powershot = 能量/发射
 blocks.targetsair = 攻击空中单位
 blocks.targetsground = 攻击地面单位
-blocks.items = 物体: {0}
+bar.items = 物体: {0}
 blocks.itemsmoved = 移动速度
 blocks.launchtime = Time Between Launches
 blocks.shootrange = 范围
@@ -375,18 +375,17 @@ blocks.liquidoutput = 液体输出
 blocks.liquidoutputspeed = 液体输出速度
 blocks.liquiduse = 液体使用速度
 blocks.coolant = 冷却剂
-blocks.liquid = 液体
+bar.liquid = 液体
 blocks.coolantuse = 冷却剂使用速度
 blocks.inputliquidfuel = 液体燃料输入
 blocks.liquidfueluse = 液体燃料使用速度
 blocks.boostitem = 强化物件
 blocks.boostliquid = 强化液体
 blocks.health = 生命值
-blocks.heat = Heat
-blocks.power = 电力
-blocks.progress = 制造进度
-blocks.spawned = 单位数量: {0}/{1}
-blocks.power.satisfaction = 电力输入
+bar.heat = Heat
+bar.power = 电力
+bar.progress = 制造进度
+bar.spawned = 单位数量: {0}/{1}
 blocks.inaccuracy = 误差
 blocks.shots = 发射数
 blocks.reload = 重新装弹