Merge branch '1.19' into 1.19-dev

Ladysnake · Jan 1, 2023 · 7271743 · 7271743
2 parents e668673 + 848b230
commit 7271743
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/src/main/resources/assets/requiem/lang/en_us.json b/src/main/resources/assets/requiem/lang/en_us.json
@@ -94,6 +94,7 @@
   "requiem:subtitles.effect.phasing": "Player phasing",
   "requiem:subtitles.effect.possession.attempt": "Possession Attempt",
   "requiem:subtitles.effect.time.stop": "ZA WARUDO! TOKI WO TOMARE",
+  "requiem:subtitles.effect.reclamation.clear": "Reclamation clears",
   "requiem:subtitles.entity.mortician.ambient": "Mortician rattles",
   "requiem:subtitles.entity.mortician.cast_spell": "Mortician casts spell",
   "requiem:subtitles.entity.mortician.death": "Mortician dies",

diff --git a/src/main/resources/assets/requiem/lang/zh_cn.json b/src/main/resources/assets/requiem/lang/zh_cn.json
@@ -83,29 +83,30 @@
   "requiem:dialogue.first_contact.final_confirm": "确定",
   "requiem:dialogue.first_contact.final_doubt": "返回",
 
-  "requiem:subtitles.block.obelisk.activate": "方尖碑形成",
-  "requiem:subtitles.block.obelisk.ambient": "方尖碑低语",
-  "requiem:subtitles.block.obelisk.deactivate": "方尖碑瓦解",
-  "requiem:subtitles.block.runestone.carve": "符文石雕刻",
-  "requiem:subtitles.block.runestone.clear": "符文石清理",
+  "requiem:subtitles.block.obelisk.activate": "方尖碑：形成",
+  "requiem:subtitles.block.obelisk.ambient": "方尖碑：低语",
+  "requiem:subtitles.block.obelisk.deactivate": "方尖碑：瓦解",
+  "requiem:subtitles.block.runestone.carve": "符文石：雕刻",
+  "requiem:subtitles.block.runestone.clear": "符文石：清空",
   "requiem:subtitles.effect.become.mortal": "成为凡人",
   "requiem:subtitles.effect.become.remnant": "成为恶魔",
-  "requiem:subtitles.effect.dissociating": "玩家解离",
-  "requiem:subtitles.effect.phasing": "玩家隧穿",
+  "requiem:subtitles.effect.dissociating": "玩家：解离",
+  "requiem:subtitles.effect.phasing": "玩家：隧穿",
   "requiem:subtitles.effect.possession.attempt": "企图附身",
   "requiem:subtitles.effect.time.stop": "砸瓦鲁多！时间 给我停止",
-  "requiem:subtitles.entity.mortician.ambient": "唤魂师摇铃",
-  "requiem:subtitles.entity.mortician.cast_spell": "唤魂师施展法术",
-  "requiem:subtitles.entity.mortician.death": "唤魂师死亡",
-  "requiem:subtitles.entity.mortician.hurt": "唤魂师受伤",
-  "requiem:subtitles.entity.mortician.no": "唤魂师不同意",
-  "requiem:subtitles.entity.mortician.prepare_attack": "唤魂师准备攻击",
-  "requiem:subtitles.entity.mortician.yes": "唤魂师同意",
-  "requiem:subtitles.entity.soul.teleport": "灵魂传送离开",
-  "requiem:subtitles.entity.soul.disintegrate": "灵魂消散",
-  "requiem:subtitles.item.empty_vessel.use": "容器激活",
-  "requiem:subtitles.item.filled_vessel.use": "灵魂得到释放",
-  "requiem:subtitles.item.soul_vessel.use": "灵魂容器激活",
+  "requiem:subtitles.effect.reclamation.clear": "再生：清除",
+  "requiem:subtitles.entity.mortician.ambient": "唤魂师：摇铃",
+  "requiem:subtitles.entity.mortician.cast_spell": "唤魂师：施展法术",
+  "requiem:subtitles.entity.mortician.death": "唤魂师：死亡",
+  "requiem:subtitles.entity.mortician.hurt": "唤魂师：受伤",
+  "requiem:subtitles.entity.mortician.no": "唤魂师：拒绝",
+  "requiem:subtitles.entity.mortician.prepare_attack": "唤魂师：准备攻击",
+  "requiem:subtitles.entity.mortician.yes": "唤魂师：同意",
+  "requiem:subtitles.entity.soul.teleport": "灵魂：传送离开",
+  "requiem:subtitles.entity.soul.disintegrate": "灵魂：消散",
+  "requiem:subtitles.item.empty_vessel.use": "容器：激活",
+  "requiem:subtitles.item.filled_vessel.use": "灵魂：得到释放",
+  "requiem:subtitles.item.soul_vessel.use": "灵魂容器：激活",
 
   "requiem:tooltip.filled_vessel": "%s灵魂",