Merge branch 'dev' into dockScanner

module/config/i18n/zh-TW.json

@@ -154,20 +154,8 @@
       "name": "每日建造",
       "help": ""
     },
-    "DataKey": {
-      "name": "檔案密鑰",
-      "help": ""
-    },
-    "SupplyPack": {
-      "name": "優惠禮包",
-      "help": ""
-    },
-    "BattlePass": {
-      "name": "大月卡",
-      "help": ""
-    },
-    "MetaReward": {
-      "name": "Meta獎勵",
+    "Freebies": {
+      "name": "免費獎勵",
       "help": ""
     },
     "Daily": {
@@ -597,6 +585,7 @@
       "name": "活動名稱",
       "help": "自動選擇至最新的活動圖",
       "campaign_main": "主線圖",
+      "event_20210121_cn": "復刻神聖的悲喜劇",
       "event_20220915_cn": "Violet Tempest Blooming Lycoris",
       "event_20210916_cn": "碧海光粼",
       "event_20200903_en": "復刻峽灣間的星辰",
@@ -640,7 +629,6 @@
       "event_20210415_tw": "復刻圍剿施佩伯爵",
       "event_20210325_cn": "Ashen Simulacrum Rerun",
       "event_20210225_tw": "北境序曲",
-      "event_20210121_cn": "Empyreal Tragicomedy Rerun",
       "event_20201126_cn": "Vacation Lane",
       "event_20200312_cn": "斯圖爾特的硝煙",
       "event_20201002_en": "Counterattack Within the Fjord",
@@ -653,10 +641,12 @@
       "event_20200423_cn": "Crimson Echoes Rerun",
       "event_20200326_cn": "Microlayer Medley",
       "event_20200227_cn": "Northern Overture",
+      "war_archives_20201029_cn": "archives Universe in Unison",
       "war_archives_20200806_cn": "archives The Enigma and the Shark",
       "war_archives_20210624_cn": "archives Swirling Cherry Blossoms",
       "war_archives_20210325_cn": "archives Ashen Simulacrum",
       "war_archives_20190911_cn": "archives Empyreal Tragicomedy",
+      "war_archives_20211014_cn": "archives Crescendo of Polaris",
       "war_archives_20200820_cn": "archives Scherzo of Iron and Blood",
       "war_archives_20181227_cn": "檔案 蒼紅的迴響",
       "war_archives_20180726_cn": "檔案 光與影的鳶尾之華",
@@ -1691,14 +1681,46 @@
       "help": ""
     }
   },
-  "DataKey": {
+  "BattlePass": {
     "_info": {
-      "name": "檔案密鑰",
+      "name": "大月卡",
       "help": ""
     },
-    "ForceGet": {
-      "name": "强制領取",
-      "help": "檔案密鑰已滿時，强制領取（消除紅點）"
+    "Collect": {
+      "name": "領取大月卡獎勵",
+      "help": ""
+    }
+  },
+  "DataKey": {
+    "_info": {
+      "name": "檔案秘鑰",
+      "help": ""
+    },
+    "Collect": {
+      "name": "領取檔案秘鑰",
+      "help": ""
+    },
+    "ForceCollect": {
+      "name": "強制領取檔案秘鑰",
+      "help": "檔案秘鑰已滿時，強制領取（消除紅點）"
+    }
+  },
+  "Mail": {
+    "_info": {
+      "name": "領取郵件",
+      "help": ""
+    },
+    "Collect": {
+      "name": "領取郵件",
+      "help": ""
+    },
+    "Filter": {
+      "name": "郵件過濾器",
+      "help": "默認只領取演習功勳郵件"
+    },
+    "Delete": {
+      "name": "刪除已讀郵件",
+      "help": ""
     }
   },
   "SupplyPack": {
@@ -1706,31 +1728,11 @@
       "name": "優惠禮包",
       "help": ""
     },
-    "WeeklyFreeSupplyPack": {
+    "Collect": {
       "name": "購買每週免費禮包",
       "help": ""
     }
   },
-  "BattlePass": {
-    "_info": {
-      "name": "大月卡",
-      "help": ""
-    },
-    "BattlePassReward": {
-      "name": "領取大月卡獎勵",
-      "help": ""
-    }
-  },
-  "MetaReward": {
-    "_info": {
-      "name": "META 獎勵",
-      "help": ""
-    },
-    "MetaReward": {
-      "name": "領取 META 獎勵",
-      "help": ""
-    }
-  },
   "Daily": {
     "_info": {
       "name": "每日任務",
@@ -1929,9 +1931,15 @@
       "name": "使用坐標記錄儀",
       "help": "每次進入倉庫的時候，使用所有的使用坐標記錄儀"
     },
-    "BuyActionPoint": {
-      "name": "買行動力",
-      "help": "用石油買行動力，行動力不足時，優先買行動力，再開箱子"
+    "BuyActionPointLimit": {
+      "name": "買行動力X次",
+      "help": "買行動力的最大次數",
+      "0": "不買",
+      "1": "1次 (1000油, 100行動力)",
+      "2": "2次 (2000油, 200行動力)",
+      "3": "3次 (4000油, 400行動力)",
+      "4": "4次 (6000油, 400行動力)",
+      "5": "5次 (10000油, 1000行動力)"
     },
     "OilLimit": {
       "name": "買行動力時，保留 X 點石油",