Merge branch 'master' of https://github.com/Anuken/Mindustry

core/assets/bundles/bundle.properties

@@ -3195,7 +3195,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_be.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_bg.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_ca.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_cs.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_da.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_de.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_es.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_et.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_eu.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_fi.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_fil.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_fr.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_id_ID.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_it.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_ja.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_ko.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_lt.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_nl.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_nl_BE.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_pl.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_pt_BR.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_pt_PT.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_ro.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_ru.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_sr.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_sv.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_th.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_tk.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_tr.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_uk_UA.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_vi.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop

core/assets/bundles/bundle_zh_CN.properties

@@ -1098,7 +1098,7 @@ status.fast.name = 迅捷
 status.shielded.name = 保护
 status.disarmed.name = 缴械
 status.invincible.name = 无敌
-status.dynamic.name = dynamic
+status.dynamic.name = 动态效果
 
 settings.language = 语言
 settings.data = 数据
@@ -3167,8 +3167,8 @@ instruction.setflag = 设置flag
 instruction.setprop = 设置属性
 instruction.playsound = 播放音效
 instruction.playmusic = 播放音乐
-instruction.setmarker = 设置marker
+instruction.setmarker = 设置 Marker
-instruction.makemarker = 创建marker
+instruction.makemarker = 创建 Marker
 instruction.localeprint = 本地化输出
 instruction.packcolor = 打包颜色
 instruction.unpackcolor = 解包颜色

core/assets/bundles/bundle_zh_TW.properties

@@ -3189,7 +3189,7 @@ contenttype.label.unit = unit
 contenttype.label.item = item
 contenttype.label.liquid = liquid
 contenttype.label.team = team
-cutsceneaction.label.active =
+cutsceneaction.label.active = active
 cutsceneaction.label.pan = pan
 cutsceneaction.label.zoom = zoom
 cutsceneaction.label.stop = stop