Merge branch 'dev' into dockScanner

module/config/i18n/zh-CN.json

@@ -357,7 +357,25 @@
       "en-1": "[EN] Lexington",
       "en-2": "[EN] Sandy",
       "en-3": "[EN] Washington",
-      "en-4": "[EN] Amagi"
+      "en-4": "[EN] Amagi",
+      "jp-0": "[JP] ブレスト",
+      "jp-1": "[JP] 横須賀",
+      "jp-2": "[JP] 佐世保",
+      "jp-3": "[JP] 呉",
+      "jp-4": "[JP] 舞鶴",
+      "jp-5": "[JP] ルルイエ",
+      "jp-6": "[JP] サモア",
+      "jp-7": "[JP] 大湊",
+      "jp-8": "[JP] トラック",
+      "jp-9": "[JP] ラバウル",
+      "jp-10": "[JP] 鹿児島",
+      "jp-11": "[JP] マドラス",
+      "jp-12": "[JP] サンディエゴ",
+      "jp-13": "[JP] 竹敷",
+      "jp-14": "[JP] キール",
+      "jp-15": "[JP] 若松",
+      "jp-16": "[JP] オデッサ",
+      "jp-17": "[JP] スイートバン"
     },
     "ScreenshotMethod": {
       "name": "模拟器截图方案",
@@ -579,6 +597,8 @@
       "name": "活动名称",
       "help": "自动选择至最新的活动",
       "campaign_main": "主线图",
+      "event_20220915_cn": "紫绛槿岚",
+      "event_20210916_cn": "碧海光粼",
       "event_20200903_en": "复刻峡湾间的星辰",
       "event_20220818_cn": "远汇点作战",
       "event_20220324_cn": "虚像构筑之塔",
@@ -608,7 +628,6 @@
       "event_20211125_cn": "交汇世界的弧光",
       "event_20211111_cn": "杰诺瓦的焰火",
       "event_20211028_tw": "復刻光與影的鳶尾之華",
-      "event_20210916_cn": "碧海光粼",
       "event_20210722_cn": "响彻碧海的偶像歌",
       "event_20210819_cn": "复刻微层混合",
       "event_20200806_cn": "复刻最重要的宝物",
@@ -1156,6 +1175,15 @@
     "TacticalFilter": {
       "name": "战术学院过滤器",
       "help": "一般不需要修改"
+    },
+    "RapidTrainingSlot": {
+      "name": "使用快速学习",
+      "help": "活动期间有每天10次的快速技能学习",
+      "do_not_use": "不使用",
+      "slot_1": "使用于1号位",
+      "slot_2": "使用于2号位",
+      "slot_3": "使用于3号位",
+      "slot_4": "使用于4号位"
     }
   },
   "ControlExpOverflow": {