Merge branch 'dev' into dockScanner

module/config/i18n/en-US.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": "Screenshot Method",
@@ -579,6 +597,8 @@
       "name": "Event Name",
       "help": "Automatically selects to the latest event",
       "campaign_main": "campaign_main",
+      "event_20220915_cn": "Violet Tempest Blooming Lycoris",
+      "event_20210916_cn": "Upon the Shimmering Blue",
       "event_20200903_en": "Stars of the Shimmering Fjord",
       "event_20220818_cn": "Operation Convergence",
       "event_20220324_cn": "Virtual Tower",
@@ -608,7 +628,6 @@
       "event_20211125_cn": "World-spanning Arclight",
       "event_20211111_cn": "The Flame-Touched Dagger",
       "event_20211028_tw": "復刻光與影的鳶尾之華",
-      "event_20210916_cn": "Upon the Shimmering Blue",
       "event_20210722_cn": "Azur Anthem",
       "event_20210819_cn": "Microlayer Medley Rerun",
       "event_20200806_cn": "The Enigma and the Shark Rerun",
@@ -1156,6 +1175,15 @@
     "TacticalFilter": {
       "name": "Tactical Book Priority",
       "help": "Generally does not need to be modified or re-arranged but can do so if desired"
+    },
+    "RapidTrainingSlot": {
+      "name": "Use Rapid Training",
+      "help": "During events, use rapid training 10 times",
+      "do_not_use": "Don't Use",
+      "slot_1": "Use on Slot #1",
+      "slot_2": "Use on Slot #2",
+      "slot_3": "Use on Slot #3",
+      "slot_4": "Use on Slot #4"
     }
   },
   "ControlExpOverflow": {