Merge remote-tracking branch 'origin/v7' into v7

core/assets/bundles/bundle_zh_CN.properties

@@ -1463,6 +1463,7 @@ setting.drawwrecks.name = 绘制单位残骸
 setting.drawallitems.name = 绘制单位携带的物品数量
 setting.drawallitems.description = 禁用此设置后仅绘制你控制的单位所携带的物品数量
 setting.drawpath.name = 跟随路径点时绘制路径
+setting.selectionsizeoncursor.name = 在光标下方绘制框选区域大小
 setting.drawselectionvanilla.name = 原版区域选择图形
 setting.drawselectionvanilla.description = 选择一块区域时绘制的轮廓 (蓝图, 重建, 摧毁).
 setting.drawcursors.name = 绘制玩家光标