Merge branch 'bug_fix' into dev

# Conflicts:
#	module/config/config_generated.py

module/config/i18n/zh-CN.json

@@ -305,6 +305,7 @@
       "com.bilibili.blhx.uc": "国服 UC九游渠道服 com.bilibili.blhx.uc",
       "com.bilibili.blhx.mzw": "国服 拇指玩渠道服 com.bilibili.blhx.mzw",
       "com.yiwu.blhx.yx15": "国服 一五游戏渠道服 com.yiwu.blhx.yx15",
+      "com.bilibili.blhx.m4399": "国服 4399渠道服 com.bilibili.blhx.m4399",
       "com.hkmanjuu.azurlane.gp.mc": "台服 com.hkmanjuu.azurlane.gp.mc"
     },
     "ServerName": {
@@ -552,6 +553,7 @@
       "name": "活动名称",
       "help": "自动选择至最新的活动",
       "campaign_main": "主线图",
+      "event_20211028_cn": "复刻穹顶下的圣咏曲",
       "event_20220728_cn": "雄鹰的叙事歌",
       "event_20200917_cn": "复刻蝶海梦花",
       "event_20201029_cn": "激唱的UNIVERSE",
@@ -578,7 +580,6 @@
       "event_20211125_cn": "交汇世界的弧光",
       "event_20211111_cn": "杰诺瓦的焰火",
       "event_20211028_tw": "復刻光與影的鳶尾之華",
-      "event_20211028_cn": "复刻穹顶下的圣咏曲",
       "event_20210916_cn": "碧海光粼",
       "event_20210722_cn": "响彻碧海的偶像歌",
       "event_20210819_cn": "复刻微层混合",