merge alas

module/config/i18n/zh-CN.json

@@ -74,13 +74,10 @@
       "name": "活动图-2",
       "help": ""
     },
-<<<<<<< HEAD
     "Event3": {
       "name": "活动图-3",
       "help": ""
     },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     "Raid": {
       "name": "共斗活动",
       "help": ""
@@ -1153,16 +1150,11 @@
     },
     "ChangeVanguard": {
       "name": "更换前排",
-<<<<<<< HEAD
       "help": "当前排红脸时更换前排，选择不更换则会强制红脸出击\n换前排通过找一艘心情不低于16、等级100的白鹰白皮驱逐完成，所以尽量保证有足够多的驱逐。国服以外则为等级70的白鹰白船驱逐。\n\n换装备只会更换正在装备中的栏位，即使是白装也会更换。如果指定了旗舰，则会更换全部5个装备，未指定旗舰只会更换设备。",
-=======
-      "help": "当前排红脸时更换前排，选择不更换则会强制红脸出击\n换前排通过找一艘心情不低于10、等级100的白鹰白皮驱逐完成，所以尽量保证有足够多的驱逐。国服以外则为等级70的白鹰白船驱逐。\n\n换装备只会更换正在装备中的栏位，即使是白装也会更换。前排会更换全部5个装备。",
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "disabled": "不更换",
       "ship": "更换舰船",
       "ship_equip": "更换舰船 + 装备"
     },
-<<<<<<< HEAD
     "ALLowLowVanguardLevel": {
       "name": "可更换低等级前排",
       "help": "倍率打开时，前排等级限制改为10以上即可。若为困难模式（如CD图）改为49级。"
@@ -1178,8 +1170,6 @@
       "name": "无法设置职能时停止任务",
       "help": "无法设置舰队职能时，以以下方式停止任务以免跨队队伍出击，石油被大量消耗：\n若设置了错误推送则推送任务停止的消息并停止该任务。\n若没有设置错误推送，则直接停止Alas。"
     },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     "CommonDD": {
       "name": "指定前排",
       "help": "",
@@ -2130,7 +2120,6 @@
       "name": "演习",
       "help": "打演习，血量过低时自动撤退"
     },
-<<<<<<< HEAD
     "DelayUntilHoursBeforeNextUpdate": {
       "name": "推迟演习至下次更新次数前 X 小时",
       "help": "",
@@ -2141,8 +2130,6 @@
       "5": "5",
       "12": "不推迟"
     },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     "OpponentChooseMode": {
       "name": "对手选择模式",
       "help": "",
@@ -2299,7 +2286,6 @@
       "3": "3",
       "4": "4"
     },
-<<<<<<< HEAD
     "FleetMode": {
       "name": "自律模式",
       "help": "",
@@ -2308,8 +2294,6 @@
       "stand_still_in_the_middle": "中路站桩",
       "hide_in_bottom_left": "躲左下角"
     },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     "Submarine": {
       "name": "呼叫潜艇",
       "help": "开启后，运行间隔将增加至60分钟"
@@ -2519,7 +2503,6 @@
       "help": "游戏被强制结束后自动登录游戏"
     }
   },
-<<<<<<< HEAD
   "GGHandler": {
     "_info": {
       "name": "GG管理器",
@@ -2817,8 +2800,6 @@
       "help": "GuildCoin.Record.help"
     }
   },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
   "Storage": {
     "_info": {
       "name": "任务状态",
@@ -2843,11 +2824,8 @@
       "Stop": "停止",
       "ScrollON": "自动滚动 开",
       "ScrollOFF": "自动滚动 关",
-<<<<<<< HEAD
       "DashboardON": "折叠",
       "DashboardOFF": "展开",
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "ClearLog": "清空日志",
       "Setting": "设置",
       "CheckUpdate": "检查更新",
@@ -2880,7 +2858,6 @@
     },
     "Overview": {
       "Scheduler": "调度器",
-<<<<<<< HEAD
       "Dashboard": "仪表盘",
       "SecondsAgo": "秒前",
       "MinutesAgo": "分钟前",
@@ -2901,8 +2878,6 @@
       "Medal": "勋章",
       "Core": "核心数据",
       "GuildCoin": "舰队币",
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "Log": "日志",
       "Running": "运行中",
       "Pending": "队列中",