diff --git a/src/locales/zh_CN/achv.json b/src/locales/zh_CN/achv.json
index f5e77dac140..6c3271dde23 100644
--- a/src/locales/zh_CN/achv.json
+++ b/src/locales/zh_CN/achv.json
@@ -274,7 +274,7 @@
     "description": "完成逆转之战挑战\n战挑战之转逆成完"
   },
   "BREEDERS_IN_SPACE": {
-    "name": "Breeders in Space!",
-    "description": "Beat the Expert Pokémon Breeder in the Space Biome."
+    "name": "饲养员上太空？",
+    "description": "在太空地图中击败精英饲养员。"
   }
 }
diff --git a/src/locales/zh_CN/bgm-name.json b/src/locales/zh_CN/bgm-name.json
index f59a637d7d8..7f13f7bd81f 100644
--- a/src/locales/zh_CN/bgm-name.json
+++ b/src/locales/zh_CN/bgm-name.json
@@ -94,7 +94,7 @@
   "battle_aether_boss":  "日月「战斗！露莎米奈」",
   "battle_skull_boss": "日月「战斗！古兹马」",
   "battle_macro_boss": "剑盾「战斗！洛兹」",
-  "battle_star_boss": "SV Cassiopeia Battle",
+  "battle_star_boss": "剑盾「战斗！仙后」",
 
   "abyss": "空之探险队「黑暗小丘」",
   "badlands": "空之探险队「枯竭之谷」",
@@ -113,13 +113,13 @@
   "island": "空之探险队「沿岸岩地」",
   "jungle": "Lmz - 丛林",
   "laboratory": "Firel - 研究所",
-  "lake": "Lmz - Lake",
+  "lake": "Lmz - 湖泊",
   "meadow": "空之探险队「天空顶端（森林）」",
   "metropolis": "Firel - 城市",
   "mountain": "空之探险队「角山」",
-  "plains": "Firel - Route 888",
+  "plains": "Firel - 888号公路",
   "power_plant": "Firel - The Klink",
-  "ruins": "Lmz - Ancient Ruins",
+  "ruins": "Lmz - 古代遗迹",
   "sea": "Andr06 - 海洋之秘",
   "seabed": "Firel - 海底",
   "slum": "Andr06 - 狡猾的雪吞虫",
@@ -129,7 +129,7 @@
   "tall_grass": "空之探险队「浓雾森林」",
   "temple": "空之探险队「守护洞穴」",
   "town": "空之探险队「随机迷宫3」",
-  "volcano": "Firel - Twisturn Volcano",
+  "volcano": "Firel - 火山曲径",
   "wasteland": "空之探险队「梦幻高原」",
   "encounter_ace_trainer": "黑白 「视线！精英训练师」",
   "encounter_backpacker": "黑白 「视线！背包客」",
diff --git a/src/locales/zh_CN/challenges.json b/src/locales/zh_CN/challenges.json
index 9351ec96285..faed9920838 100644
--- a/src/locales/zh_CN/challenges.json
+++ b/src/locales/zh_CN/challenges.json
@@ -22,7 +22,7 @@
   },
   "freshStart": {
     "name": "初次尝试",
-    "desc": "你只能使用御三家，就像是你第一次玩宝可梦肉鸽一样。",
+    "desc": "你只能使用原始状态的御三家，就像是你开了新号。",
     "value.0": "关闭",
     "value.1": "开启"
   },
@@ -33,4 +33,4 @@
     "value.0": "关闭",
     "value.1": "开启"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh_CN/dialogue.json b/src/locales/zh_CN/dialogue.json
index 3e258de22f6..78f0845b436 100644
--- a/src/locales/zh_CN/dialogue.json
+++ b/src/locales/zh_CN/dialogue.json
@@ -741,69 +741,69 @@
   },
   "star_grunt": {
     "encounter": {
-      "1": "We're Team Star, kid. We burn so bright, it hurts to look at us!",
-      "2": "We'll come at you full force - Hasta la vistaaar! ★",
-      "3": "If you don't clear out real quick-like, I'll hafta come at you in self-defense. You get me?",
-      "4": "Sorry, but if you don't turn yourself around here, amigo, we'll have to send you packing!",
-      "4_female": "Sorry, but if you don't turn yourself around here, amiga, we'll have to send you packing!",
-      "5": "Oh great. Here comes another rando to ruin my day."
+      "1": "我们是天星队，小子。\n我们光芒四射，都能刺瞎狗眼！",
+      "2": "我们不会留情！让您星苦了 ★",
+      "3": "如果你不尽快撤离，我就要正当防卫了。\n你懂我的意思吗？",
+      "4": "对不起，但是如果你不在这儿打道回府，\n朋友，我们就得打发你走了！",
+      "4_female": "对不起，但是如果你不在这儿打道回府，\n朋友，我们就得打发你走了！",
+      "5": "哦，太好了。又来了个神人糟蹋我的一天。"
     },
     "victory": {
-      "1": "How come I'M the one seeing stars?!",
-      "2": "You're scary, kid. If you joined Team Star, you'd be looking down from the top in no time!",
-      "3": "I defended myself all right... But it wasn't enough!",
-      "4": "H-hasta la vistar... ★",
-      "5": "I didn't think grunt work for Team Star newbies would be this much of a chore..."
+      "1": "我怎么会眼冒天星呢？！",
+      "2": "你好可怕，小子。如果你加入了天星队，\n你很快就会上位的！",
+      "3": "我保正当防卫了……但还不够！",
+      "4": "今天星苦了……★",
+      "5": "我没想到天星队新人的活儿要这么星苦……"
     }
   },
   "giacomo": {
     "encounter": {
-      "1": "You don't really think things through, do ya? Declarin' war on Team Star is a real bad move.",
-      "2": "I'll play you a sick requiem as you crash and burn. Let's get this party staaarteeed!"
+      "1": "你真的没有仔细三思过？\n向天星队宣战是一个坏主意。",
+      "2": "当你崩溃时，我会为你演奏一首美妙的安魂曲。\n让派对开始吧！"
     },
     "victory": {
-      "1": "Guess that's that...",
-      "2": "You turned my melody into a threnody..."
+      "1": "看来到此为止了……",
+      "2": "你把我的旋律变成了挽歌……"
     }
   },
   "mela": {
     "encounter": {
-      "1": "So you're the dope who picked a fight with Team Star... Prepare to get messed up.",
-      "2": "All riiight, BRING IT! I'll blow everythin' sky high!"
+      "1": "所以你就是那个向天星队挑起争端的傻瓜……\n准备好被碾碎吧！",
+      "2": "好吧，来吧！我会把一切都炸上天！"
     },
     "victory": {
-      "1": "Ugh. Is this really how it's gonna end? What a hassle...",
-      "2": "I burned through everythin' I had...and now I've sputtered out."
+      "1": "呃。这就结束了？真麻烦……",
+      "2": "我已经耗尽了我拥有的一切……现在我已精疲力尽。"
     }
   },
   "atticus": {
     "encounter": {
-      "1": "You have some nerve baring your fangs at Team Star. Come, then, villainous wretch!",
-      "2": "Be warned—I shall spare thee no mercy! En garde!"
+      "1": "你竟敢对星队露出獠牙。来吧，恶棍！",
+      "2": "准备好，我不会饶过你！预备！"
     },
     "victory": {
-      "1": "Forgive me, my friends...",
-      "2": "You have utterly bested me. But thy victory stir'd no bitterness within me—such was its brilliance."
+      "1": "原谅我，伙计们……",
+      "2": "你完全打败了我。但你的胜利并没有激起我的痛苦\n……它是如此辉煌。"
     }
   },
   "ortega": {
     "encounter": {
-      "1": "I promise I'll play nice, so don't blame me when this battle sends you blubbering back home!",
-      "2": "I'll wipe that smug look off your face for sure! You're going down!"
+      "1": "我保证我很厉害，\n所以让你哭鼻子回家了可不要怪我！",
+      "2": "我一定会让你脸上的得意洋洋\n的表情消失！你完蛋了！"
     },
     "victory": {
-      "1": "Ugh! How could I LOSE! What the HECK!",
-      "2": "Arrrrgggh! That strength of yours is SO. NOT. FAIR."
+      "1": "啊！？我怎么会输？搞什么？",
+      "2": "呃啊啊啊！你那实力，开了吧！"
     }
   },
   "eri": {
     "encounter": {
-      "1": "Doesn't matter who you are. I'll bury anyone who tries to take down Team Star!",
-      "2": "I give as good as I get—that's a promise! We'll see who's left standing in the end!"
+      "1": "不管你是谁。任何想打败天星队的人都会被我埋葬！",
+      "2": "我付出会有回报，我很确信！我们看看最后谁能站得住脚！"
     },
     "victory": {
-      "1": "I'm so sorry, everyone...",
-      "2": "I gave it my all, but it wasn't enough—I wasn't enough..."
+      "1": "对不起……大伙……",
+      "2": "我竭尽全力，但还不够……我还不够……"
     }
   },
   "rocket_boss_giovanni_1": {
@@ -995,24 +995,24 @@
   },
   "star_boss_penny_1": {
     "encounter": {
-      "1": "I'm the big boss of Team Star. The name's Cassiopeia. \n$Now, bow down before the overwhelming might of Team Star's founder!"
+      "1": "我就是天星队的真老大，名字叫仙后。\n$现在，向天星队屈服吧。"
     },
     "victory": {
-      "1": "... ... .."
+      "1": "………………"
     },
     "defeat": {
-      "1": "Heh..."
+      "1": "呵……"
     }
   },
   "star_boss_penny_2": {
     "encounter": {
-      "1": "I won't hold back in this battle! I'll stay true to Team Star's code! \n$My Veevee power will crush you into stardust!"
+      "1": "我不会在这场战斗中退缩！我会忠于天星队的纲领！\n$我的伊布布们会将你碾成星屑！"
     },
     "victory": {
-      "1": "...It's all over now."
+      "1": "这下都结束了……"
     },
     "defeat": {
-      "1": "I can't fault you on your battle skills at all... Considering how the bosses fell at your hands."
+      "1": "一想到那些队长是如何在被打倒在你手中的，\n我对你的战斗技巧完全挑不出毛病。"
     }
   },
   "macro_boss_rose_2": {
diff --git a/src/locales/zh_CN/fight-ui-handler.json b/src/locales/zh_CN/fight-ui-handler.json
index aa8bf4f77c5..c648e8f6793 100644
--- a/src/locales/zh_CN/fight-ui-handler.json
+++ b/src/locales/zh_CN/fight-ui-handler.json
@@ -4,5 +4,5 @@
   "accuracy": "命中",
   "abilityFlyInText": " {{pokemonName}} 的\n{{passive}}{{abilityName}}",
   "passive": "被动 ",
-  "teraHover": "{{type}} 太晶化"
+  "teraHover": "{{type}}太晶化"
 }
diff --git a/src/locales/zh_CN/modifier-select-ui-handler.json b/src/locales/zh_CN/modifier-select-ui-handler.json
index 24b6e205f10..21e707b493d 100644
--- a/src/locales/zh_CN/modifier-select-ui-handler.json
+++ b/src/locales/zh_CN/modifier-select-ui-handler.json
@@ -9,6 +9,6 @@
   "checkTeamDesc": "检查队伍或使用形态改变道具",
   "rerollCost": "₽{{formattedMoney}}",
   "itemCost": "₽{{formattedMoney}}",
-  "continueNextWaveButton": "Continue",
-  "continueNextWaveDescription": "Continue to the next wave"
+  "continueNextWaveButton": "继续",
+  "continueNextWaveDescription": "继续至下一层"
 }
diff --git a/src/locales/zh_CN/move.json b/src/locales/zh_CN/move.json
index d20b09f02be..87d9d66d234 100644
--- a/src/locales/zh_CN/move.json
+++ b/src/locales/zh_CN/move.json
@@ -3725,7 +3725,7 @@
   },
   "combatTorque": {
     "name": "格斗暴冲",
-    "effect": "攻击目标造成伤害，有30%的几\n率使目标陷入麻痹状态。\n此招式可以命中幽灵属性的宝可梦。"
+    "effect": "攻击目标造成伤害，有30%的几\n率使目标陷入麻痹状态。"
   },
   "magicalTorque": {
     "name": "魔法暴冲",
diff --git a/src/locales/zh_CN/mystery-encounters/absolute-avarice-dialogue.json b/src/locales/zh_CN/mystery-encounters/absolute-avarice-dialogue.json
index 6637d3ff7ed..36bec1d1d64 100644
--- a/src/locales/zh_CN/mystery-encounters/absolute-avarice-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/absolute-avarice-dialogue.json
@@ -1,7 +1,7 @@
 {
-  "intro": "一个{{greedentName}}埋伏了你\\n并且偷走了你队伍携带的树果！",
+  "intro": "一个{{greedentName}}埋伏了你\n并且偷走了你队伍携带的树果！",
   "title": "贪得无厌",
-  "description": "{{greedentName}}让你措手不及，现在你所有的树果都被夺走了！\n\n{{greedentName}}正要吃掉它们时，突然停下来饶有兴趣地看着你。",
+  "description": "{{greedentName}}让你措手不及，\n现在你所有的树果都被夺走了！\n\n{{greedentName}}正要吃掉它们时，\n突然停下来饶有兴趣地看着你。",
   "query": "你要怎么做？",
   "option": {
     "1": {
diff --git a/src/locales/zh_CN/mystery-encounters/an-offer-you-cant-refuse-dialogue.json b/src/locales/zh_CN/mystery-encounters/an-offer-you-cant-refuse-dialogue.json
index d920e4e52d1..62c1c116542 100644
--- a/src/locales/zh_CN/mystery-encounters/an-offer-you-cant-refuse-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/an-offer-you-cant-refuse-dialogue.json
@@ -1,9 +1,9 @@
 {
   "intro": "一名看上去就很有钱的小男孩拦住了你。",
   "speaker": "富家子弟",
-  "intro_dialogue": "向你问好。$你的{{strongestPokemon}}看起来举世无双，我挪不开我的眼睛了！\n$我一直也想要一只那样的宝可梦！$你的报酬不会少的，\n这个老家伙也可以送给你！",
+  "intro_dialogue": "向你问好。$你的{{strongestPokemon}}看起来举世无双，我挪不开我的眼睛了！\n我一直也想要一只那样的宝可梦！$你的报酬不会少的，\n这个老家伙也可以送给你！",
   "title": "难以拒绝的买卖",
-  "description": "对方愿意为了你的{{strongestPokemon}}出一个@[TOOLTIP_TITLE]{闪光护符}和{{price, money}}。\n\n这交易非常值得，但是你真的舍得放弃如此强大的伙伴吗？",
+  "description": "对方愿意为了你的{{strongestPokemon}}\n出一个@[TOOLTIP_TITLE]{闪光护符}和{{price, money}}。\n\n这交易非常值得，但是你真的舍得\n送走如此强大的伙伴吗？",
   "query": "你要怎么做？",
   "option": {
     "1": {
@@ -14,7 +14,7 @@
     "2": {
       "label": "敲诈他",
       "tooltip": "(+){{option2PrimaryName}}使用{{moveOrAbility}}\n(+)获得{{price, money}}",
-      "tooltip_disabled": "你的宝可梦需要具备某些特性或招式才能选择此项",
+      "tooltip_disabled": "你的宝可梦需要具备某些\n特性或招式才能选择此项",
       "selected": "我的天，你抢劫我。{{liepardName}}，走了！$我要找律师告你！"
     },
     "3": {
diff --git a/src/locales/zh_CN/mystery-encounters/berries-abound-dialogue.json b/src/locales/zh_CN/mystery-encounters/berries-abound-dialogue.json
index 9e2240e2aea..8856d3c45c2 100644
--- a/src/locales/zh_CN/mystery-encounters/berries-abound-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/berries-abound-dialogue.json
@@ -1,7 +1,7 @@
 {
   "intro": "宝可梦旁边\n有着巨大的树果丛！",
   "title": "硕“果”累累",
-  "description": "似乎有强大的宝可梦守护着树果丛。\n最简单的方法是战斗，但它的实力不容小觑。\n也许一只速度很快的宝可梦可以乘机顺走一些树果？",
+  "description": "似乎有强大的宝可梦守护着树果丛。\n最简单的方法是战斗，\n但它的实力不容小觑。\n也许一只速度很快的宝可梦\n可以乘机顺走一些树果？",
   "query": "你要怎么做？",
   "berries": "树果！！",
   "option": {
diff --git a/src/locales/zh_CN/mystery-encounters/bug-type-superfan-dialogue.json b/src/locales/zh_CN/mystery-encounters/bug-type-superfan-dialogue.json
index c63c74dc248..e66759d1955 100644
--- a/src/locales/zh_CN/mystery-encounters/bug-type-superfan-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/bug-type-superfan-dialogue.json
@@ -14,7 +14,7 @@
     "2": {
       "label": "展示虫宝可梦",
       "tooltip": "(+)获得一件道具",
-      "disabled_tooltip": "你需要至少携带一只虫系宝可梦",
+      "disabled_tooltip": "你需要至少携带\n一只虫系宝可梦",
       "selected": "你向训练师展示了你所有的虫系宝可梦",
       "selected_0_to_1": "哈？你才有{{numBugTypes}}。$你对我来说真是浪费时间。",
       "selected_2_to_3": "嘿，你有{{numBugTypes}}！\n不错。$来，这能帮你多抓点虫虫。",
@@ -24,7 +24,7 @@
     "3": {
       "label": "赠送虫系道具",
       "tooltip": "(-)给予训练师{{requiredBugItems}}\n(+)得到一件礼物",
-      "disabled_tooltip": "你需要一件{{requiredBugItems}}才能选择",
+      "disabled_tooltip": "你需要一件{{requiredBugItems}}\n才能选择",
       "select_prompt": "选择一件道具",
       "invalid_selection": "宝可梦未持有该类道具",
       "selected": "你递交了{{selectedItem}}.",
diff --git a/src/locales/zh_CN/mystery-encounters/clowning-around-dialogue.json b/src/locales/zh_CN/mystery-encounters/clowning-around-dialogue.json
index 5eb739e3b18..127a5efc377 100644
--- a/src/locales/zh_CN/mystery-encounters/clowning-around-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/clowning-around-dialogue.json
@@ -3,13 +3,13 @@
   "speaker": "小丑",
   "intro_dialogue": "小丑踩高跷，战斗要来到！\n吵吵闹闹，将你打倒！",
   "title": "小丑闹剧",
-  "description": "有点不对劲，这小丑想要挑衅你，\n目的是什么呢？\n尤其是那{{blacephalonName}}看起来非常奇怪，就好像它有着@[TOOLTIP_TITLE]{与众不同的属性和特性。}",
+  "description": "有点不对劲，这小丑想要挑衅你，\n目的是什么呢？\n尤其是那{{blacephalonName}}看起来非常奇怪，\n就好像它有着\n@[TOOLTIP_TITLE]{与众不同的属性和特性。}",
   "query": "你要怎么做？",
   "option": {
     "1": {
       "label": "与小丑战斗",
       "tooltip": "(-)奇妙的战斗\n(?)影响宝可梦特性",
-      "selected": "你可怜的宝可梦正准备进行可悲的表演！",
+      "selected": "你可怜的宝可梦正准备上演可悲的马戏！",
       "apply_ability_dialogue": "精彩的演出！\n出色的指挥与夺目的招式相得益彰！",
       "apply_ability_message": "小丑将永久地将你的一只宝可梦的特性交换为{{ability}}！",
       "ability_prompt": "你想永久地教会一只宝可梦{{ability}}吗？",
diff --git a/src/locales/zh_CN/mystery-encounters/dancing-lessons-dialogue.json b/src/locales/zh_CN/mystery-encounters/dancing-lessons-dialogue.json
index e1818ce06c1..57f9ca27e8b 100644
--- a/src/locales/zh_CN/mystery-encounters/dancing-lessons-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/dancing-lessons-dialogue.json
@@ -1,7 +1,7 @@
 {
   "intro": "一位{{oricorioName}}正孤独起舞，没有舞伴。",
   "title": "舞蹈课",
-  "description": "{{oricorioName}}并不咄咄逼人，反而有些哀伤。\n\n也许他只想找个人一起跳舞…",
+  "description": "{{oricorioName}}并不咄咄逼人，\n反而有些哀伤。\n\n也许他只想找个人一起跳舞…",
   "query": "你要怎么做？",
   "option": {
     "1": {
@@ -18,7 +18,7 @@
     "3": {
       "label": "表演一支舞蹈",
       "tooltip": "(-)教{{oricorioName}}一支舞蹈\n(+){{oricorioName}}会喜欢你",
-      "disabled_tooltip": "你的宝可梦需要习得一种舞蹈动作。",
+      "disabled_tooltip": "你的宝可梦需要\n习得一种舞蹈动作。",
       "select_prompt": "选择一个舞蹈招式",
       "selected": "{{oricorioName}}着迷地观看着\n{{selectedPokemon}}展示{{selectedMove}}！$它喜欢这场表演！$@s{level_up_fanfare}{{oricorioName}}想要加入你的队伍！"
     }
diff --git a/src/locales/zh_CN/mystery-encounters/dark-deal-dialogue.json b/src/locales/zh_CN/mystery-encounters/dark-deal-dialogue.json
index 82863084de7..e2fd316f9f3 100644
--- a/src/locales/zh_CN/mystery-encounters/dark-deal-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/dark-deal-dialogue.json
@@ -1,11 +1,11 @@
 
 
 {
-  "intro": "一个穿着破旧大衣的陌生人\\n挡在你的路上…",
+  "intro": "一个穿着破旧大衣的陌生人\n\n挡在你的路上…",
   "speaker": "可疑的家伙",
   "intro_dialogue": "嘿，你！我一直在研究一种新装置，\n能让宝可梦从原子级重组，变成更强大的形态！\n嘿嘿…@d{64}我只需要一点祭…@d{32}\n我是说，试验品，来证明它的效果。",
   "title": "黑暗交易",
-  "description": "这个诡异的家伙举起一些精灵球。\n我会让你感到物超所值的！\n我只要你队伍里的一只宝可梦，这些强力的精灵球就是你的了，嘿嘿…",
+  "description": "这个诡异的家伙举起一些精灵球。\n我会让你感到物超所值的！\n我只要你队伍里的一只宝可梦，\n这些强力的精灵球就是你的了，嘿嘿…",
   "query": "你要怎么做？",
   "option": {
     "1": {
diff --git a/src/locales/zh_CN/mystery-encounters/delibirdy-dialogue.json b/src/locales/zh_CN/mystery-encounters/delibirdy-dialogue.json
index 82b114b401b..3a15f5f98be 100644
--- a/src/locales/zh_CN/mystery-encounters/delibirdy-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/delibirdy-dialogue.json
@@ -3,7 +3,7 @@
 {
   "intro": "一伙{{delibirdName}}出现了！",
   "title": "信使鸟快递",
-  "description": "{{delibirdName}}满怀期待地看着你，它们好像想要什么东西。\\n也许给它们一件道具或一些钱能让它们满意？",
+  "description": "{{delibirdName}}满怀期待地看着你，\n它们好像想要什么东西。\n\n也许给它们一件道具或一些钱能让它们满意？",
   "query": "你要给它们什么？",
   "invalid_selection": "宝可梦身上并没有那种道具。",
   "option": {
@@ -14,7 +14,7 @@
     },
     "2": {
       "label": "给吃的",
-      "tooltip": "(-)给予{{delibirdName}}们树果或复活之种\n(+)获得一件礼物",
+      "tooltip": "(-)给予{{delibirdName}}们\n树果或复活之种\n(+)获得一件礼物",
       "select_prompt": "选择要给予的道具",
       "selected": "你向{{delibirdName}}们扔了点{{chosenItem}}，\n它们兴奋地互相嚷嚷着。$信使鸟们转向你并高兴地给你一份礼物！"
     },
diff --git a/src/locales/zh_CN/mystery-encounters/fiery-fallout-dialogue.json b/src/locales/zh_CN/mystery-encounters/fiery-fallout-dialogue.json
index 7113ecab2a1..aa50ee7991d 100644
--- a/src/locales/zh_CN/mystery-encounters/fiery-fallout-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/fiery-fallout-dialogue.json
@@ -1,7 +1,7 @@
 {
   "intro": "你遭遇了一场烟灰风暴！",
   "title": "炽热余波",
-  "description": "呼啸的火山灰和余烬使能见度几乎为零。\n看来可能有什么…东西造成了这种状况。\n但到底会是什么呢？",
+  "description": "呼啸的火山灰和余烬\n使能见度几乎为零。\n看来可能有什么…东西\n造成了这种状况。\n但到底会是什么呢？",
   "query": "你要怎么做？",
   "option": {
     "1": {
@@ -18,7 +18,7 @@
     "3": {
       "label": "让火系宝可梦帮忙",
       "tooltip": "(+)解决困境\n(+)获得木炭",
-      "disabled_tooltip": "你至少需要两只火系宝可梦来选择",
+      "disabled_tooltip": "你至少需要两只\n火系宝可梦来选择",
       "selected": "你的{{option3PrimaryName}}和{{option3SecondaryName}}引导你发现了两只{{volcaronaName}}正在求偶起舞的地方！$幸运的是，你的宝可梦能够让它们平静下来，\n然后它们就平安离开了。"
     }
   },
diff --git a/src/locales/zh_CN/mystery-encounters/fight-or-flight-dialogue.json b/src/locales/zh_CN/mystery-encounters/fight-or-flight-dialogue.json
index e60a73e885f..9ab8256e59f 100644
--- a/src/locales/zh_CN/mystery-encounters/fight-or-flight-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/fight-or-flight-dialogue.json
@@ -1,7 +1,7 @@
 {
   "intro": "宝可梦附近的地上\n有闪闪发光的东西！",
   "title": "战逃反应",
-  "description": "似乎有强大的宝可梦守护着这一道具。\n战斗是最直接的方法，但是它的实力似乎不容小觑。\n如果你有合适的宝可梦，似乎也可以直接偷走它。",
+  "description": "似乎有强大的宝可梦守护着这一道具。\n战斗是最直接的方法，但是\n它的实力似乎不容小觑。\n如果你有合适的宝可梦，\n似乎也可以直接偷走它。",
   "query": "你要怎么做？",
   "option": {
     "1": {
@@ -12,7 +12,7 @@
     },
     "2": {
       "label": "窃取物品",
-      "disabled_tooltip": "你的宝可梦需要习得特定的招式来选择。",
+      "disabled_tooltip": "你的宝可梦需要习得\n特定的招式来选择。",
       "tooltip": "(+){{option2PrimaryName}}使用{{option2PrimaryMove}}",
       "selected": ".@d{32}.@d{32}.@d{32}$你的{{option2PrimaryName}}愿意帮忙，并使用了{{option2PrimaryMove}}！$你偷走了道具！"
     },
diff --git a/src/locales/zh_CN/mystery-encounters/fun-and-games-dialogue.json b/src/locales/zh_CN/mystery-encounters/fun-and-games-dialogue.json
index d732a2444bd..5ac788b51ba 100644
--- a/src/locales/zh_CN/mystery-encounters/fun-and-games-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/fun-and-games-dialogue.json
@@ -2,7 +2,7 @@
   "intro_dialogue": "来看看吧，大伙！\n在这全新的{{wobbuffetName}}捶捶乐上试试运气！\n",
   "speaker": "艺人",
   "title": "快乐游戏！",
-  "description": "你遇到了一个有奖游戏活动！\n你有 @[TOOLTIP_TITLE]{3 回合}的时间来在\n@[TOOLTIP_TITLE]{不打倒}{{wobbuffetName}}的情况下将它尽可能的打到@[TOOLTIP_TITLE]{1血}\n这样，它就能通过反作用力在敲钟器上打出超高数字！\n但要小心！如果你不小心打倒了{{wobbuffetName}}，你就得付医疗费！",
+  "description": "你遇到了一个有奖游戏活动！\n你有 @[TOOLTIP_TITLE]{3 回合}的时间来在\n@[TOOLTIP_TITLE]{不打倒}{{wobbuffetName}}的情况下将它尽可能的打到@[TOOLTIP_TITLE]{1血}\n这样，它就能通过反作用力\n在敲钟器上打出超高数字！\n但要小心！如果你不小心打倒了{{wobbuffetName}}，\n你就得付医疗费！",
   "query": "要试试么？",
   "option": {
     "1": {
diff --git a/src/locales/zh_CN/mystery-encounters/global-trade-system-dialogue.json b/src/locales/zh_CN/mystery-encounters/global-trade-system-dialogue.json
index edc83ed5f08..4b0d2e84edc 100644
--- a/src/locales/zh_CN/mystery-encounters/global-trade-system-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/global-trade-system-dialogue.json
@@ -1,22 +1,22 @@
 {
   "intro": "是GTS系统的交互面板！",
   "title": "全球交换系统（GTS）",
-  "description": "啊，GTS！科学的奇迹，\\n你可以与世界各地的任何人联系，与他们交换宝可梦！\\n今天你的交换会有好运吗？",
+  "description": "啊，GTS！科学的奇迹，\\nn你可以与世界各地的任何人联系，\n与他们交换宝可梦！\n今天你的交换会有好运吗？",
   "query": "你要怎么做？",
   "option": {
     "1": {
       "label": "查找交换请求",
-      "tooltip": "(+)为一只宝可梦选择交换",
+      "tooltip": "(+)为一只宝可梦\n选择交换",
       "trade_options_prompt": "选择一只要通过交换接收的神奇宝贝。"
     },
     "2": {
       "label": "奇迹交换",
-      "tooltip": "(+)将你的一只宝可梦送至GTS，并获得一只随机宝可梦作为回报"
+      "tooltip": "(+)将一只宝可梦送至GTS，\n并获得一只随机宝可梦"
     },
     "3": {
       "label": "道具交换",
       "trade_options_prompt": "选择要发送的道具",
-      "invalid_selection": "这只宝可梦没有合法道具可以被交换。",
+      "invalid_selection": "这只宝可梦没有合法道具\n可以被交换。",
       "tooltip": "(+)将你的一件道具发送到GTS并获得一件随机新道具"
     },
     "4": {
diff --git a/src/locales/zh_CN/mystery-encounters/lost-at-sea-dialogue.json b/src/locales/zh_CN/mystery-encounters/lost-at-sea-dialogue.json
index 9d769e99d83..f3231b2a429 100644
--- a/src/locales/zh_CN/mystery-encounters/lost-at-sea-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/lost-at-sea-dialogue.json
@@ -1,26 +1,26 @@
 {
   "intro": "在大海中漫无目的地游荡，无处可循。",
   "title": "迷失大海",
-  "description": "这片海域波涛汹涌，你的体力即将耗尽。\\n太糟了，有什么办法么？",
+  "description": "这片海域波涛汹涌，\n你的体力即将耗尽。\n太糟了，有什么办法么？",
   "query": "你要怎么做？",
   "option": {
     "1": {
       "label": "{{option1PrimaryName}}可以帮忙",
       "label_disabled": "无法{{option1RequiredMove}}",
       "tooltip": "(+){{option1PrimaryName}}帮助你\n(+){{option1PrimaryName}}获得经验值",
-      "tooltip_disabled": "你没有宝可梦能够{{option1RequiredMove}}",
+      "tooltip_disabled": "你没有宝可梦\n能够{{option1RequiredMove}}",
       "selected": "{{option1PrimaryName}}游在前面，引导你回到正轨。${{option1PrimaryName}}似乎也在这次需要它的时候变得更强大了！"
     },
     "2": {
       "label": "{{option2PrimaryName}}可以帮忙",
       "label_disabled": "无法{{option2RequiredMove}}",
       "tooltip": "(+){{option2PrimaryName}}帮助你\n(+){{option2PrimaryName}}获得经验值",
-      "tooltip_disabled": "你没有宝可梦能够{{option2RequiredMove}}",
+      "tooltip_disabled": "你没有宝可梦\n能够{{option2RequiredMove}}",
       "selected": "{{option2PrimaryName}}飞在你的船前面，引导你回到正轨。在这次需要它的时候，${{option2PrimaryName}}似乎也变得更强大了！"
     },
     "3": {
       "label": "漫无目的地漂流",
-      "tooltip": "(-)每一只宝可梦损失{{damagePercentage}}%的HP",
+      "tooltip": "(-)每一只宝可梦\n损失{{damagePercentage}}%的HP",
       "selected": "你在船上漂浮，漫无目的地航行，直到最后发现了一个你记得的地标。$你和你的宝可梦因整个经历而疲惫不堪。"
     }
   },
diff --git a/src/locales/zh_CN/mystery-encounters/mysterious-challengers-dialogue.json b/src/locales/zh_CN/mystery-encounters/mysterious-challengers-dialogue.json
index 574c577127c..44f76a24fea 100644
--- a/src/locales/zh_CN/mystery-encounters/mysterious-challengers-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/mysterious-challengers-dialogue.json
@@ -1,7 +1,7 @@
 {
   "intro": "神秘的挑战者出现了！",
   "title": "神秘挑战者",
-  "description": "如果你击败了挑战者，你给他们留下的强烈印象可能会换来奖励。\\n但他们看起来很强，要接受挑战么？",
+  "description": "如果你击败了挑战者，\n你给他们留下的强烈印象\n可能会换来奖励。\n但他们看起来很强，\n要接受挑战么？",
   "query": "你要接受谁的挑战？",
   "option": {
     "1": {
diff --git a/src/locales/zh_CN/mystery-encounters/mysterious-chest-dialogue.json b/src/locales/zh_CN/mystery-encounters/mysterious-chest-dialogue.json
index 2ccba9215ae..ff01386ca59 100644
--- a/src/locales/zh_CN/mystery-encounters/mysterious-chest-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/mysterious-chest-dialogue.json
@@ -1,7 +1,7 @@
 {
   "intro": "你发现了一个…@d{32}宝箱?",
   "title": "神秘宝箱",
-  "description": "一个装饰精美的箱子立在地上。里面一定有好东西…吧？",
+  "description": "一个装饰精美的箱子立在地上。\n里面一定有好东西…吧？",
   "query": "要打开么?",
   "option": {
     "1": {
diff --git a/src/locales/zh_CN/mystery-encounters/part-timer-dialogue.json b/src/locales/zh_CN/mystery-encounters/part-timer-dialogue.json
index 437a34ecd1a..ed093b9fb6b 100644
--- a/src/locales/zh_CN/mystery-encounters/part-timer-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/part-timer-dialogue.json
@@ -3,25 +3,25 @@
   "speaker": "工人",
   "intro_dialogue": "你看起来有不少能干的宝可梦！\n如果你愿意帮忙干点活，我们会付钱的！",
   "title": "兼职",
-  "description": "似乎有不少活要干。根据你宝可梦对任务的适应度，\n你能获得或多或少的报酬。",
+  "description": "似乎有不少活要干。\n根据你宝可梦对任务的适应度，\n你能获得或多或少的报酬。",
   "query": "你要干什么活？",
   "invalid_selection": "宝可梦必须足够健康",
   "option": {
     "1": {
       "label": "外卖",
-      "tooltip": "(-)宝可梦使用速度\n(+)赚取@[MONEY]{Money}",
+      "tooltip": "(-)使用速度\n(+)赚取@[MONEY]{金钱}",
       "selected": "您的{{selectedPokemon}}轮班为客户配送订单。"
     },
     "2": {
       "label": "仓管",
-      "tooltip": "(-)宝可梦使用力量和耐力\n(+)赚取@[MONEY]{Money}",
+      "tooltip": "(-)使用力量和耐力\n(+)赚取@[MONEY]{金钱}",
       "selected": "你的{{selectedPokemon}}轮班工作，在仓库内搬运物品。"
     },
     "3": {
       "label": "销售",
-      "tooltip": "(-)你的{{option3PrimaryName}}使用{{option3PrimaryMove}}\n(+)赚取@[MONEY]{Money}",
-      "disabled_tooltip": "你的宝可梦需要习得适合这份工作的招式",
-      "selected": "你的{{option3PrimaryName}}花费一天时间使用{{option3PrimaryMove}}来吸引客户！"
+      "tooltip": "(-)你的{{option3PrimaryName}}使用{{option3PrimaryMove}}\n(+)赚取@[MONEY]{金钱}",
+      "disabled_tooltip": "你的宝可梦需要习得\n适合这份工作的招式",
+      "selected": "你的{{option3PrimaryName}}花费一天时间\n使用{{option3PrimaryMove}}来吸引客户！"
     }
   },
   "job_complete_good": "谢谢你的帮助！\n你的{{selectedPokemon}}帮了大忙了！这是你的日结。",
diff --git a/src/locales/zh_CN/mystery-encounters/safari-zone-dialogue.json b/src/locales/zh_CN/mystery-encounters/safari-zone-dialogue.json
index b8a17aaccf4..6e31593a1f2 100644
--- a/src/locales/zh_CN/mystery-encounters/safari-zone-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/safari-zone-dialogue.json
@@ -1,7 +1,7 @@
 {
   "intro": "到狩猎地带了！",
   "title": "狩猎地带",
-  "description": "这里有各种稀有和特殊的宝可梦！\n如果选择进入，你将有3次机会遇到野生宝可梦，供你捕获。\n但注意了，它们可能会在你捕捉到之前逃走！",
+  "description": "这里有各种稀有和特殊的宝可梦！\n如果选择进入，你将有3次机会\n遇到野生宝可梦，供你捕获。\n但注意了，它们可能会在你捕捉到之前逃走！",
   "query": "要进去试试吗？",
   "option": {
     "1": {
diff --git a/src/locales/zh_CN/mystery-encounters/shady-vitamin-dealer-dialogue.json b/src/locales/zh_CN/mystery-encounters/shady-vitamin-dealer-dialogue.json
index 570035d8670..359376eca3d 100644
--- a/src/locales/zh_CN/mystery-encounters/shady-vitamin-dealer-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/shady-vitamin-dealer-dialogue.json
@@ -3,17 +3,17 @@
   "speaker": "可疑的销售",
   "intro_dialogue": ".@d{16}.@d{16}.@d{16}\n我有货，要来点么？\n当然，你的宝可梦得顶得住。",
   "title": "营养饮料商人",
-  "description": "男子打开外套，露出一些宝可梦营养饮料。\n他报出的数字非常划算。有点太划算了…\n他提供两种套餐供你选择。",
+  "description": "男子打开外套，\n露出一些宝可梦营养饮料。\n他报出的数字非常划算。\n有点太划算了…\n他还提供两种套餐供你选择。",
   "query": "你要选哪一种？",
   "invalid_selection": "宝可梦必须足够健康",
   "option": {
     "1": {
       "label": "经济套餐",
-      "tooltip": "(-)支付{{option1Money, money}}\n(-)副作用？\n(+)选择的宝可梦获得两份随机努力药"
+      "tooltip": "(-)支付{{option1Money, money}}\n(-)副作用？\n(+)选择的宝可梦获得\n两份随机努力药"
     },
     "2": {
       "label": "高级套餐",
-      "tooltip": "(-)支付{{option2Money, money}}\n(+)选择的宝可梦获得两份随机努力药"
+      "tooltip": "(-)支付{{option2Money, money}}\n(+)选择的宝可梦获得\n两份随机努力药"
     },
     "3": {
       "label": "离开",
diff --git a/src/locales/zh_CN/mystery-encounters/slumbering-snorlax-dialogue.json b/src/locales/zh_CN/mystery-encounters/slumbering-snorlax-dialogue.json
index a9dda26cd2d..ee3109e3a1f 100644
--- a/src/locales/zh_CN/mystery-encounters/slumbering-snorlax-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/slumbering-snorlax-dialogue.json
@@ -1,7 +1,7 @@
 {
   "intro": "当你走在一条狭窄的小路上时，\n一个高耸的身影挡住了你的去路。\n当你走近时，你看到了一个{{snorlaxName}}正在酣睡。\n似乎没有办法绕过它。",
   "title": "沉睡的{{snorlaxName}}",
-  "description": "你可以攻击它来让它醒来，要么就等它睡醒。\n谁知道要等多久呢？",
+  "description": "你可以攻击它来让它醒来，\n要么就等它睡醒。\n谁知道要等多久呢？",
   "query": "你要怎么做？",
   "option": {
     "1": {
@@ -18,7 +18,7 @@
     "3": {
       "label": "偷摸",
       "tooltip": "(+){{option3PrimaryName}}使用{{option3PrimaryMove}}\n(+)特别的奖励",
-      "disabled_tooltip": "宝可梦需要习得特别的招式来选择",
+      "disabled_tooltip": "宝可梦需要习得\n特别的招式来选择",
       "selected": "你的{{option3PrimaryName}}使用{{option3PrimaryMove}}！$@s{item_fanfare}它从熟睡的\n{{snorlaxName}}身上偷走了吃剩的东西，简直像个怪盗！"
     }
   }
diff --git a/src/locales/zh_CN/mystery-encounters/teleporting-hijinks-dialogue.json b/src/locales/zh_CN/mystery-encounters/teleporting-hijinks-dialogue.json
index 5b4fbf614d8..ce0d0d44843 100644
--- a/src/locales/zh_CN/mystery-encounters/teleporting-hijinks-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/teleporting-hijinks-dialogue.json
@@ -12,7 +12,7 @@
     "2": {
       "label": "宝可梦帮忙",
       "tooltip": "(-){{option2PrimaryName}}帮忙\n(+){{option2PrimaryName}}获得经验\n(?)传送至随机地图",
-      "disabled_tooltip": "你需要一只钢系或电系宝可梦来选择此项",
+      "disabled_tooltip": "你需要一只钢系或\n电系宝可梦来选择此项",
       "selected": "{{option2PrimaryName}}的类型允许你绕过机器的付费装置！$胶囊打开，你走进去……"
     },
     "3": {
diff --git a/src/locales/zh_CN/mystery-encounters/the-expert-pokemon-breeder-dialogue.json b/src/locales/zh_CN/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
index 4ab42a61264..057bc6847c1 100644
--- a/src/locales/zh_CN/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
@@ -1,10 +1,10 @@
 {
   "intro": "这是一位携带大量神奇宝贝蛋的训练师！",
-  "intro_dialogue": "嘿，训练师！$看起来你的一些\n宝可梦感觉有点沮丧。$为什么不和我打一场来让它们兴奋一下呢？",
+  "intro_dialogue": "嘿，训练师！$看起来你的一些\n宝可梦感觉有点沮丧。$为什么不和我打一场\n来让它们兴奋一下呢？",
   "title": "专业饲养员",
-  "description": "你被发起了一场@[TOOLTIP_TITLE]{只能使用一只宝可梦}的挑战。\n这可能很难，但它肯定会\n加深你与所选神奇宝贝之间的联系！\n如果你赢了，饲养员还会给你一些@[TOOLTIP_TITLE]{蛋}！",
+  "description": "你被发起了一场\n@[TOOLTIP_TITLE]{只能使用一只宝可梦}的挑战。\n这可能很难，但它肯定会\n加深你与所选宝可梦之间的牵绊！\n如果你赢了，饲养员还会\n给你一些@[TOOLTIP_TITLE]{蛋}！",
   "query": "Who will you battle with?",
-  "cleffa_1_nickname": "王牌",
+  "cleffa_1_nickname": "超级王牌",
   "cleffa_2_nickname": "皮氪稀",
   "cleffa_3_nickname": "帝王{{speciesName}}",
   "option": {
diff --git a/src/locales/zh_CN/mystery-encounters/the-pokemon-salesman-dialogue.json b/src/locales/zh_CN/mystery-encounters/the-pokemon-salesman-dialogue.json
index 1f8c91cf4ca..c0c2c419650 100644
--- a/src/locales/zh_CN/mystery-encounters/the-pokemon-salesman-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/the-pokemon-salesman-dialogue.json
@@ -3,14 +3,14 @@
   "speaker": "绅士",
   "intro_dialogue": "你好啊！我有一份专门为你准备的好买卖！",
   "title": "宝可梦销售员",
-  "description": "“这个{{purchasePokemon}}非常独特，拥有该物种通常不具备的特性！只需{{price, money}}就让你拥有这个与众不同的{{purchasePokemon}}！”\n\n“你怎么说？”",
-  "description_shiny": "“这个{{purchasePokemon}}非常独特，拥有该物种非常不寻常的颜色！只需{{price, money}}就让你拥有这个与众不同的{{purchasePokemon}}！”\n\n“你怎么说？”",
+  "description": "“这个{{purchasePokemon}}非常独特，\n拥有该物种通常不具备的特性！只需{{price, money}}就让你拥有\n这个与众不同的{{purchasePokemon}}！”\n\n“你怎么说？”",
+  "description_shiny": "“这个{{purchasePokemon}}非常独特，\n拥有该物种非常不寻常的颜色！只需{{price, money}}就让你拥有\n这个与众不同的{{purchasePokemon}}！”\n\n“你怎么说？”",
   "query": "你要怎么做？",
   "option": {
     "1": {
       "label": "接受",
-      "tooltip": "(-)支付{{price, money}}\n(+)获得{{purchasePokemon}}和它的隐藏特性",
-      "tooltip_shiny": "(-)支付{{price, money}}\n(+)获得一只闪光的{{purchasePokemon}}",
+      "tooltip": "(-)支付{{price, money}}\n(+)获得{{purchasePokemon}}和\n它的隐藏特性",
+      "tooltip_shiny": "(-)支付{{price, money}}\n(+)获得一只闪光的\n{{purchasePokemon}}",
       "selected_message": "你花了一大笔钱买了{{purchasePokemon}}.",
       "selected_dialogue": "非常好的选择！$我看得出来你对商业有敏锐的眼光。$哦，对了……@d{64}不接受退货，你懂吗？"
     },
diff --git a/src/locales/zh_CN/mystery-encounters/the-strong-stuff-dialogue.json b/src/locales/zh_CN/mystery-encounters/the-strong-stuff-dialogue.json
index 170ce3193df..d7455cbe472 100644
--- a/src/locales/zh_CN/mystery-encounters/the-strong-stuff-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/the-strong-stuff-dialogue.json
@@ -1,12 +1,12 @@
 {
   "intro": "眼前是一个巨大的{{shuckleName}}而看起来\n有一大壶……果汁？",
   "title": "满满当当",
-  "description": "挡住你去路的{{shuckleName}}看起来异常强大。与此同时，它旁边的果汁散发着某种力量。\n\n{{shuckleName}}向你伸出了触角。它似乎想做些什么……",
+  "description": "挡住你去路的{{shuckleName}}\n看起来异常强大。与此同时，它旁边的果汁\n散发着某种力量。\n\n{{shuckleName}}向你伸出了触角。\n它似乎想做些什么……",
   "query": "你要怎么做？",
   "option": {
     "1": {
       "label": "接近{{shuckleName}}",
-      "tooltip": "(?)可能会发生一些可怕或惊奇的事情",
+      "tooltip": "(?)可能会发生一些\n可怕或惊奇的事情",
       "selected": "你眼前一黑",
       "selected_2": "@f{150}当你醒来时，{{shuckleName}}不见了。\n并且壶里的果汁完全耗尽。${{highBstPokemon1}}和{{highBstPokemon2}}\n觉得一阵可怕的无力感袭来！$他们的基础属性减少了{{reductionValue}}！$然而，你剩下的神奇宝贝却感到精力充沛！\n他们的基础属性增加了{{increaseValue}}！"
     },
diff --git a/src/locales/zh_CN/mystery-encounters/the-winstrate-challenge-dialogue.json b/src/locales/zh_CN/mystery-encounters/the-winstrate-challenge-dialogue.json
index ecd7d336136..b5256d0bd95 100644
--- a/src/locales/zh_CN/mystery-encounters/the-winstrate-challenge-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/the-winstrate-challenge-dialogue.json
@@ -3,7 +3,7 @@
   "speaker": "连胜家族",
   "intro_dialogue": "我们是连胜家族！$你觉得和我们一家人来一场宝可梦车轮战怎么样？",
   "title": "连胜家族的挑战",
-  "description": "连胜家族由 5 名训练师组成，他们想要战斗！\n如果你连续击败他们所有人，他们会给你一份大奖。但你能承受压力吗？",
+  "description": "连胜家族由5名训练师组成，\n他们想要战斗！\n如果你连续击败他们所有人，\n他们会给你一份大奖。\n但你能承受压力吗？",
   "query": "你要怎么做？",
   "option": {
     "1": {
diff --git a/src/locales/zh_CN/mystery-encounters/training-session-dialogue.json b/src/locales/zh_CN/mystery-encounters/training-session-dialogue.json
index 8d0b1dea64d..dab52bef1db 100644
--- a/src/locales/zh_CN/mystery-encounters/training-session-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/training-session-dialogue.json
@@ -1,13 +1,13 @@
 {
   "intro": "你遇到了一些\n训练工具和用品。",
   "title": "集训",
-  "description": "这些物品似乎可以用来训练你的队伍！\n有数种方式可以进行训练：让你队伍中的其他宝可梦与其进行对战。",
+  "description": "这些物品似乎可以\n用来训练你的队伍！\n有数种方式可以进行训练：\n让你队伍中的其他宝可梦与其进行对战。",
   "query": "要怎么训练？",
   "invalid_selection": "宝可梦必须足够健康",
   "option": {
     "1": {
       "label": "轻量训练",
-      "tooltip": "(-)轻松战斗\n(+)提升随机2只宝可梦的个体",
+      "tooltip": "(-)轻松战斗\n(+)提升随机2只\n宝可梦的个体",
       "finished": "{{selectedPokemon}}回来了，感觉\n虽然疲惫不堪，但很有成就！$它的{{stat1}}和{{stat2}}的个体得到了改善！"
     },
     "2": {
diff --git a/src/locales/zh_CN/mystery-encounters/trash-to-treasure-dialogue.json b/src/locales/zh_CN/mystery-encounters/trash-to-treasure-dialogue.json
index 69e719064e9..29e7817923b 100644
--- a/src/locales/zh_CN/mystery-encounters/trash-to-treasure-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/trash-to-treasure-dialogue.json
@@ -1,12 +1,12 @@
 {
   "intro": "一大堆垃圾！\n这是从哪儿来的？",
   "title": "变废为宝",
-  "description": "垃圾堆在你眼前晃来晃去，你似乎在垃圾中发现一些有价值的物品。\n不过，你确定要弄得脏兮兮地去拿它们吗？",
+  "description": "垃圾堆在你眼前晃来晃去，\n你似乎在垃圾中发现一些有价值的物品。\n不过，你确定要弄得脏兮兮地去拿它们吗？",
   "query": "你要怎么做？",
   "option": {
     "1": {
       "label": "挖掘宝贝",
-      "tooltip": "(-)商店的治疗用品消失\n(+)获得精美礼品",
+      "tooltip": "(-)商店的治疗道具消失\n(+)获得精美礼品",
       "selected": "你穿过垃圾堆，没入污秽之中。$在你这样肮脏的状态下，任何有尊严的店主\n都不会卖给你任何东西！$你只能将就将就，不再购买治疗物品。$然而，你在垃圾中还是发现了一些不可思议的宝贝！"
     },
     "2": {
diff --git a/src/locales/zh_CN/mystery-encounters/uncommon-breed-dialogue.json b/src/locales/zh_CN/mystery-encounters/uncommon-breed-dialogue.json
index 1e321a6e614..f844cae5908 100644
--- a/src/locales/zh_CN/mystery-encounters/uncommon-breed-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/uncommon-breed-dialogue.json
@@ -1,7 +1,7 @@
 {
   "intro": "这可不是一只普通的宝可梦！",
   "title": "罕见物种",
-  "description": "{{enemyPokemon}}看起来与其他同种宝可梦大相径庭。\n@[TOOLTIP_TITLE]{也许它会特殊招式？}\n你可以直接进行战斗并尝试捕获它，但可能也有办法和它交朋友。",
+  "description": "{{enemyPokemon}}看起来与其他同种宝可梦大相径庭。\n@[TOOLTIP_TITLE]{也许它会特殊招式？}\n你可以直接进行战斗并尝试捕获它，\n但可能也有办法和它交朋友。",
   "query": "你要怎么做？",
   "option": {
     "1": {
@@ -12,13 +12,13 @@
     },
     "2": {
       "label": "给他吃的",
-      "disabled_tooltip": "你需要4个树果来选择此项",
+      "disabled_tooltip": "你需要4个树果\n来选择此项",
       "tooltip": "(-)给予4个树果\n(+){{enemyPokemon}}会喜欢你",
       "selected": "你把树果扔向{{enemyPokemon}}！$它高兴地把树果吃干抹净！${{enemyPokemon}}想加入你的队伍！"
     },
     "3": {
       "label": "交朋友",
-      "disabled_tooltip": "你的宝可梦需要习得某些招式才能选择此项",
+      "disabled_tooltip": "你的宝可梦需要习得\n某些招式才能选择此项",
       "tooltip": "(+){{option3PrimaryName}}使用{{option3PrimaryMove}}\n(+){{enemyPokemon}}会喜欢你",
       "selected": "你的{{option3PrimaryName}}使用了{{option3PrimaryMove}}来吸引{{enemyPokemon}}！${{enemyPokemon}}想加入你的队伍！"
     }
diff --git a/src/locales/zh_CN/mystery-encounters/weird-dream-dialogue.json b/src/locales/zh_CN/mystery-encounters/weird-dream-dialogue.json
index 0bff2cdbb4c..acee3c6eb81 100644
--- a/src/locales/zh_CN/mystery-encounters/weird-dream-dialogue.json
+++ b/src/locales/zh_CN/mystery-encounters/weird-dream-dialogue.json
@@ -3,7 +3,7 @@
   "speaker": "女人",
   "intro_dialogue": "我看到了你的未来，你的过去……$孩子，你也看到了吗？",
   "title": "???",
-  "description": "女人的话语在你的脑海里回荡。\n那不是同一个人的声音，\n而是来自所有时间和空间的众多声音。\n你开始感到头晕目眩，这个问题萦绕在你的脑海中……\n\n@[TOOLTIP_TITLE]{\"我看到了你的未来，你的过去……$孩子，你也看到了吗？\"}",
+  "description": "女人的话语在你的脑海里回荡。\n那不是同一个人的声音，\n而是来自所有时间和空间的众多声音。\n你开始感到头晕目眩，\n这个问题萦绕在你的脑海中……\n\n@[TOOLTIP_TITLE]{\"我看到了你的未来，你的过去……\n孩子，你也看到了吗？\"}",
   "query": "你要怎么做？",
   "option": {
     "1": {
diff --git a/src/locales/zh_CN/party-ui-handler.json b/src/locales/zh_CN/party-ui-handler.json
index 4ddea7cd789..2bc74991824 100644
--- a/src/locales/zh_CN/party-ui-handler.json
+++ b/src/locales/zh_CN/party-ui-handler.json
@@ -15,7 +15,7 @@
   "UNPAUSE_EVOLUTION": "解除进化暂停",
   "REVIVE": "复活",
   "RENAME": "起名",
-  "SELECT": "Select",
+  "SELECT": "选择",
   "choosePokemon": "选择一只宝可梦。",
   "doWhatWithThisPokemon": "要对宝可梦做什么？",
   "noEnergy": "{{pokemonName}}没有力气战斗了！",
diff --git a/src/locales/zh_CN/pokemon-form.json b/src/locales/zh_CN/pokemon-form.json
index c2ad12bbf16..f10c21e8851 100644
--- a/src/locales/zh_CN/pokemon-form.json
+++ b/src/locales/zh_CN/pokemon-form.json
@@ -39,65 +39,65 @@
   "unownZ": "Z",
   "unownExclamation": "!",
   "unownQuestion": "?",
-  "castform": "Normal Form",
+  "castform": "通常",
   "castformSunny": "晴天",
   "castformRainy": "雨天",
   "castformSnowy": "雪天",
   "deoxysNormal": "普通",
-  "deoxysAttack": "Attack",
-  "deoxysDefense": "Defense",
-  "deoxysSpeed": "Speed",
+  "deoxysAttack": "进攻",
+  "deoxysDefense": "防御",
+  "deoxysSpeed": "速度",
   "burmyPlant": "草木蓑衣",
   "burmySandy": "砂土蓑衣",
   "burmyTrash": "垃圾蓑衣",
-  "cherubiOvercast": "Overcast",
-  "cherubiSunshine": "Sunshine",
+  "cherubiOvercast": "阴天",
+  "cherubiSunshine": "晴天",
   "shellosEast": "东海",
   "shellosWest": "西海",
-  "rotom": "Normal",
+  "rotom": "通常",
   "rotomHeat": "加热",
   "rotomWash": "清洗",
   "rotomFrost": "结冰",
   "rotomFan": "旋转",
   "rotomMow": "切割",
-  "dialga": "Normal",
-  "dialgaOrigin": "Origin",
-  "palkia": "Normal",
-  "palkiaOrigin": "Origin",
+  "dialga": "通常",
+  "dialgaOrigin": "起源",
+  "palkia": "通常",
+  "palkiaOrigin": "起源",
   "giratinaAltered": "别种",
-  "giratinaOrigin": "Origin",
+  "giratinaOrigin": "起源",
   "shayminLand": "陆上",
-  "shayminSky": "Sky",
+  "shayminSky": "天空",
   "basculinRedStriped": "红条纹",
   "basculinBlueStriped": "蓝条纹",
   "basculinWhiteStriped": "白条纹",
-  "darumaka": "Standard Mode",
-  "darumakaZen": "Zen",
+  "darumaka": "普通",
+  "darumakaZen": "达摩",
   "deerlingSpring": "春天",
   "deerlingSummer": "夏天",
   "deerlingAutumn": "秋天",
   "deerlingWinter": "冬天",
   "tornadusIncarnate": "化身",
-  "tornadusTherian": "Therian",
+  "tornadusTherian": "灵兽",
   "thundurusIncarnate": "化身",
-  "thundurusTherian": "Therian",
+  "thundurusTherian": "灵兽",
   "landorusIncarnate": "化身",
-  "landorusTherian": "Therian",
-  "kyurem": "Normal",
-  "kyuremBlack": "Black",
-  "kyuremWhite": "White",
+  "landorusTherian": "灵兽",
+  "kyurem": "普通",
+  "kyuremBlack": "暗黑",
+  "kyuremWhite": "焰白",
   "keldeoOrdinary": "通常",
-  "keldeoResolute": "Resolute",
+  "keldeoResolute": "觉悟",
   "meloettaAria": "歌声",
   "meloettaPirouette": "舞步形态",
-  "genesect": "Normal",
-  "genesectShock": "Shock Drive",
-  "genesectBurn": "Burn Drive",
-  "genesectChill": "Chill Drive",
-  "genesectDouse": "Douse Drive",
-  "froakie": "Normal",
+  "genesect": "通常",
+  "genesectShock": "闪电驱动",
+  "genesectBurn": "燃烧驱动",
+  "genesectChill": "寒冰驱动",
+  "genesectDouse": "水流驱动",
+  "froakie": "通常",
   "froakieBattleBond": "牵绊变身",
-  "froakieAsh": "Ash",
+  "froakieAsh": "小智",
   "scatterbugMeadow": "花园花纹",
   "scatterbugIcySnow": "冰雪花纹",
   "scatterbugPolar": "雪国花纹",
@@ -133,11 +133,11 @@
   "furfrouLaReine": "女王造型",
   "furfrouKabuki": "歌舞伎造型",
   "furfrouPharaoh": "国王造型",
-  "espurrMale": "Male",
-  "espurrFemale": "Female",
-  "honedgeShiled": "Shield",
-  "honedgeBlade": "Blade",
-  "pumpkaboo": "Average Size",
+  "espurrMale": "雄性",
+  "espurrFemale": "雌性",
+  "honedgeShiled": "盾牌",
+  "honedgeBlade": "利剑",
+  "pumpkaboo": "平均尺寸",
   "pumpkabooSmall": "小尺寸",
   "pumpkabooLarge": "大尺寸",
   "pumpkabooSuper": "特大尺寸",
@@ -148,37 +148,37 @@
   "zygarde50Pc": "５０％形态 群聚变形",
   "zygarde10Pc": "１０％形态 群聚变形",
   "zygardeComplete": "完全体形态",
-  "hoopa": "Confined",
-  "hoopaUnbound": "Unbound",
+  "hoopa": "惩戒",
+  "hoopaUnbound": "解放",
   "oricorioBaile": "热辣热辣风格",
   "oricorioPompom": "啪滋啪滋风格",
   "oricorioPau": "呼拉呼拉风格",
   "oricorioSensu": "轻盈轻盈风格",
-  "rockruff": "Normal",
+  "rockruff": "通常",
   "rockruffOwnTempo": "特殊岩狗狗",
-  "rockruffMidday": "Midday",
-  "rockruffMidnight": "Midnight",
-  "rockruffDusk": "Dusk",
-  "wishiwashi": "Solo Form",
-  "wishiwashiSchool": "School",
-  "typeNullNormal": "Type: Normal",
-  "typeNullFighting": "Type: Fighting",
-  "typeNullFlying": "Type: Flying",
-  "typeNullPoison": "Type: Poison",
-  "typeNullGround": "Type: Ground",
-  "typeNullRock": "Type: Rock",
-  "typeNullBug": "Type: Bug",
-  "typeNullGhost": "Type: Ghost",
-  "typeNullSteel": "Type: Steel",
-  "typeNullFire": "Type: Fire",
-  "typeNullWater": "Type: Water",
-  "typeNullGrass": "Type: Grass",
-  "typeNullElectric": "Type: Electric",
-  "typeNullPsychic": "Type: Psychic",
-  "typeNullIce": "Type: Ice",
-  "typeNullDragon": "Type: Dragon",
-  "typeNullDark": "Type: Dark",
-  "typeNullFairy": "Type: Fairy",
+  "rockruffMidday": "白天",
+  "rockruffMidnight": "夜晚",
+  "rockruffDusk": "黄昏",
+  "wishiwashi": "单独",
+  "wishiwashiSchool": "鱼群",
+  "typeNullNormal": "属性：普通",
+  "typeNullFighting": "属性：格斗",
+  "typeNullFlying": "属性：飞行",
+  "typeNullPoison": "属性：毒",
+  "typeNullGround": "属性：地面",
+  "typeNullRock": "属性：岩石",
+  "typeNullBug": "属性：虫",
+  "typeNullGhost": "属性：幽灵",
+  "typeNullSteel": "属性：钢",
+  "typeNullFire": "属性：火",
+  "typeNullWater": "属性：水",
+  "typeNullGrass": "属性：草",
+  "typeNullElectric": "属性：电",
+  "typeNullPsychic": "属性：超能力",
+  "typeNullIce": "属性：冰",
+  "typeNullDragon": "属性：龙",
+  "typeNullDark": "属性：恶",
+  "typeNullFairy": "属性：妖精",
   "miniorRedMeteor": "红色核心",
   "miniorOrangeMeteor": "橙色核心",
   "miniorYellowMeteor": "黄色核心",
@@ -195,66 +195,66 @@
   "miniorViolet": "紫色",
   "mimikyuDisguised": "化形",
   "mimikyuBusted": "现形",
-  "necrozma": "Normal",
-  "necrozmaDuskMane": "Dusk Mane",
-  "necrozmaDawnWings": "Dawn Wings",
-  "necrozmaUltra": "Ultra",
-  "magearna": "Normal",
+  "necrozma": "通常",
+  "necrozmaDuskMane": "黄昏之鬃",
+  "necrozmaDawnWings": "拂晓之翼",
+  "necrozmaUltra": "究极",
+  "magearna": "通常",
   "magearnaOriginal": "500年前的颜色",
-  "marshadow": "Normal",
+  "marshadow": "通常",
   "marshadowZenith": "全力",
-  "cramorant": "Normal",
-  "cramorantGulping": "Gulping Form",
-  "cramorantGorging": "Gorging Form",
-  "toxelAmped": "Amped Form",
-  "toxelLowkey": "Low-Key Form",
+  "cramorant": "通常",
+  "cramorantGulping": "一口吞",
+  "cramorantGorging": "大口吞",
+  "toxelAmped": "高调",
+  "toxelLowkey": "低调",
   "sinisteaPhony": "赝品",
   "sinisteaAntique": "真品",
-  "milceryVanillaCream": "Vanilla Cream",
-  "milceryRubyCream": "Ruby Cream",
-  "milceryMatchaCream": "Matcha Cream",
-  "milceryMintCream": "Mint Cream",
-  "milceryLemonCream": "Lemon Cream",
-  "milcerySaltedCream": "Salted Cream",
-  "milceryRubySwirl": "Ruby Swirl",
-  "milceryCaramelSwirl": "Caramel Swirl",
-  "milceryRainbowSwirl": "Rainbow Swirl",
-  "eiscue": "Ice Face",
+  "milceryVanillaCream": "奶香香草",
+  "milceryRubyCream": "奶香红钻",
+  "milceryMatchaCream": "奶香抹茶",
+  "milceryMintCream": "奶香薄荷",
+  "milceryLemonCream": "奶香柠檬",
+  "milcerySaltedCream": "奶香海燕",
+  "milceryRubySwirl": "红钻综合",
+  "milceryCaramelSwirl": "教堂综合",
+  "milceryRainbowSwirl": "三色综合",
+  "eiscue": "冰冻头",
   "eiscueNoIce": "解冻头",
   "indeedeeMale": "雄性",
   "indeedeeFemale": "雌性",
   "morpekoFullBelly": "满腹花纹",
-  "morpekoHangry": "Hangry",
+  "morpekoHangry": "空腹花纹",
   "zacianHeroOfManyBattles": "百战勇者",
-  "zacianCrowned": "Crowned",
+  "zacianCrowned": "盾之王",
   "zamazentaHeroOfManyBattles": "百战勇者",
-  "zamazentaCrowned": "Crowned",
-  "kubfuSingleStrike": "Single Strike",
-  "kubfuRapidStrike": "Rapid Strike",
-  "zarude": "Normal",
+  "zamazentaCrowned": "剑之王",
+  "kubfuSingleStrike": "一击",
+  "kubfuRapidStrike": "连击",
+  "zarude": "通常",
   "zarudeDada": "老爹",
-  "calyrex": "Normal",
-  "calyrexIce": "Ice Rider",
-  "calyrexShadow": "Shadow Rider",
-  "basculinMale": "Male",
-  "basculinFemale": "Female",
+  "calyrex": "通常",
+  "calyrexIce": "白马",
+  "calyrexShadow": "黑马",
+  "basculinMale": "雄性",
+  "basculinFemale": "雌性",
   "enamorusIncarnate": "化身",
-  "enamorusTherian": "Therian",
-  "lechonkMale": "Male",
-  "lechonkFemale": "Female",
-  "tandemausFour": "Family of Four",
-  "tandemausThree": "Family of Three",
+  "enamorusTherian": "灵兽",
+  "lechonkMale": "雄性",
+  "lechonkFemale": "雌性",
+  "tandemausFour": "四口之家",
+  "tandemausThree": "三口之家",
   "squawkabillyGreenPlumage": "绿羽毛",
   "squawkabillyBluePlumage": "蓝羽毛",
   "squawkabillyYellowPlumage": "黄羽毛",
   "squawkabillyWhitePlumage": "白羽毛",
-  "finizenZero": "Zero",
-  "finizenHero": "Hero",
+  "finizenZero": "平凡",
+  "finizenHero": "全能",
   "tatsugiriCurly": "上弓姿势",
   "tatsugiriDroopy": "下垂姿势",
   "tatsugiriStretchy": "平挺姿势",
-  "dunsparceTwo": "Two-Segment",
-  "dunsparceThree": "Three-Segment",
+  "dunsparceTwo": "两节",
+  "dunsparceThree": "三节",
   "gimmighoulChest": "宝箱形态",
   "gimmighoulRoaming": "徒步形态",
   "koraidonApexBuild": "顶尖形态",
@@ -269,21 +269,21 @@
   "miraidonGlideMode": "滑翔模式",
   "poltchageistCounterfeit": "冒牌货",
   "poltchageistArtisan": "高档货",
-  "poltchageistUnremarkable": "Unremarkable",
-  "poltchageistMasterpiece": "Masterpiece",
-  "ogerponTealMask": "Teal Mask",
-  "ogerponTealMaskTera": "Teal Mask Terastallized",
-  "ogerponWellspringMask": "Wellspring Mask",
-  "ogerponWellspringMaskTera": "Wellspring Mask Terastallized",
-  "ogerponHearthflameMask": "Hearthflame Mask",
-  "ogerponHearthflameMaskTera": "Hearthflame Mask Terastallized",
-  "ogerponCornerstoneMask": "Cornerstone Mask",
-  "ogerponCornerstoneMaskTera": "Cornerstone Mask Terastallized",
-  "terpagos": "Normal Form",
-  "terpagosTerastal": "Terastal",
-  "terpagosStellar": "Stellar",
-  "galarDarumaka": "Standard Mode",
-  "galarDarumakaZen": "Zen",
+  "poltchageistUnremarkable": "凡作",
+  "poltchageistMasterpiece": "杰作",
+  "ogerponTealMask": "碧草面具",
+  "ogerponTealMaskTera": "碧草面具太晶化",
+  "ogerponWellspringMask": "水井面具",
+  "ogerponWellspringMaskTera": "水井面具太晶化",
+  "ogerponHearthflameMask": "火灶面具",
+  "ogerponHearthflameMaskTera": "火灶面具太晶化",
+  "ogerponCornerstoneMask": "础石面具",
+  "ogerponCornerstoneMaskTera": "础石面具太晶化",
+  "terpagos": "普通",
+  "terpagosTerastal": "太晶",
+  "terpagosStellar": "星晶",
+  "galarDarumaka": "通常",
+  "galarDarumakaZen": "达摩",
   "paldeaTaurosCombat": "斗战种",
   "paldeaTaurosBlaze": "火炽种",
   "paldeaTaurosAqua": "水澜种"
diff --git a/src/locales/zh_CN/trainer-classes.json b/src/locales/zh_CN/trainer-classes.json
index ba126b9ec65..492d39a8c42 100644
--- a/src/locales/zh_CN/trainer-classes.json
+++ b/src/locales/zh_CN/trainer-classes.json
@@ -100,34 +100,34 @@
   "worker_female": "工人",
   "workers": "工人组合",
   "youngster": "短裤小子",
-  "rocket_grunt": "火箭队手下",
-  "rocket_grunt_female": "火箭队手下",
-  "rocket_grunts": "火箭队手下们",
-  "magma_grunt": "熔岩队手下",
-  "magma_grunt_female": "熔岩队手下",
-  "magma_grunts": "熔岩队手下们",
-  "aqua_grunt": "海洋队手下",
-  "aqua_grunt_female": "海洋队手下",
-  "aqua_grunts": "海洋队手下们",
-  "galactic_grunt": "银河队手下",
-  "galactic_grunt_female": "银河队手下",
-  "galactic_grunts": "银河队手下们",
-  "plasma_grunt": "等离子队手下",
-  "plasma_grunt_female": "等离子队手下",
-  "plasma_grunts": "等离子队手下们",
-  "flare_grunt": "闪焰队手下",
-  "flare_grunt_female": "闪焰队手下",
-  "flare_grunts": "闪焰队手下们",
+  "rocket_grunt": "火箭队队员",
+  "rocket_grunt_female": "火箭队队员",
+  "rocket_grunts": "火箭队队员们",
+  "magma_grunt": "熔岩队队员",
+  "magma_grunt_female": "熔岩队队员",
+  "magma_grunts": "熔岩队队员们",
+  "aqua_grunt": "海洋队队员",
+  "aqua_grunt_female": "海洋队队员",
+  "aqua_grunts": "海洋队队员们",
+  "galactic_grunt": "银河队队员",
+  "galactic_grunt_female": "银河队队员",
+  "galactic_grunts": "银河队队员们",
+  "plasma_grunt": "等离子队队员",
+  "plasma_grunt_female": "等离子队队员",
+  "plasma_grunts": "等离子队队员们",
+  "flare_grunt": "闪焰队队员",
+  "flare_grunt_female": "闪焰队队员",
+  "flare_grunts": "闪焰队队员们",
   "aether_grunt": "以太基金会职员",
   "aether_grunt_female": "以太基金会职员",
   "aether_grunts": "以太基金会职员",
-  "skull_grunt": "骷髅队手下",
-  "skull_grunt_female": "骷髅队手下",
-  "skull_grunts": "骷髅队手下",
+  "skull_grunt": "骷髅队队员",
+  "skull_grunt_female": "骷髅队队员",
+  "skull_grunts": "骷髅队队员",
   "macro_grunt": "马洛科蒙训练师",
   "macro_grunt_female": "马洛科蒙训练师",
   "macro_grunts": "马洛科蒙训练师",
-  "star_grunt": "Star Grunt",
-  "star_grunt_female": "Star Grunt",
-  "star_grunts": "Star Grunts"
+  "star_grunt": "天星队手下",
+  "star_grunt_female": "天星队手下",
+  "star_grunts": "天星队手下们"
 }
diff --git a/src/locales/zh_CN/trainer-names.json b/src/locales/zh_CN/trainer-names.json
index dea307ef0bf..475e9081df4 100644
--- a/src/locales/zh_CN/trainer-names.json
+++ b/src/locales/zh_CN/trainer-names.json
@@ -141,11 +141,11 @@
   "faba": "扎奥博",
   "plumeria": "布尔美丽",
   "oleana": "奥莉薇",
-  "giacomo": "Giacomo",
-  "mela": "Mela",
-  "atticus": "Atticus",
-  "ortega": "Ortega",
-  "eri": "Eri",
+  "giacomo": "皮拿",
+  "mela": "梅洛可",
+  "atticus": "秋明",
+  "ortega": "奥尔迪加",
+  "eri": "枇琶",
   
   "maxie": "赤焰松",
   "archie": "水梧桐",
diff --git a/src/locales/zh_CN/trainer-titles.json b/src/locales/zh_CN/trainer-titles.json
index 8ac8acf0a3a..6af992521be 100644
--- a/src/locales/zh_CN/trainer-titles.json
+++ b/src/locales/zh_CN/trainer-titles.json
@@ -19,7 +19,7 @@
   "aether_boss": "以太基金会理事长",
   "skull_boss": "骷髅队老大",
   "macro_boss": "马洛科蒙总裁",
-  "star_boss": "Team Star Leader",
+  "star_boss": "天星队真老大",
 
   "rocket_admin": "火箭队干部",
   "rocket_admin_female": "火箭队干部",
@@ -36,7 +36,7 @@
   "aether_admin": "以太基金会干部",
   "skull_admin": "骷髅队干部",
   "macro_admin": "马洛科蒙干部",
-  "star_admin": "Team Star Squad Boss",
+  "star_admin": "天星队老大",
 
   "the_winstrates": "连胜家族"
 }