From d0a04f2588b7a847f439538e01284f733cce6298 Mon Sep 17 00:00:00 2001
From: 502y <53784463+502y@users.noreply.github.com>
Date: Thu, 8 Jun 2023 23:34:39 +0800
Subject: [PATCH] Revert "Merge branch 'Ludeon:master' into master"

This reverts commit d95f68aaa103bf67291b1e21cf28325e7fc77ac6, reversing
changes made to 4a293a211692df1bdedbbb481d52d25b4427f5ae.
---
 .../ThingDef/Items_Resource_Manufactured.xml   |  6 +++---
 .../RitualOutcomeEffectDef/Ritual_Outcomes.xml |  2 +-
 Core/Keyed/Misc_Gameplay.xml                   |  2 +-
 .../RitualOutcomeEffectDef/Ritual_Outcomes.xml | 18 +++++++++---------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Biotech/DefInjected/ThingDef/Items_Resource_Manufactured.xml b/Biotech/DefInjected/ThingDef/Items_Resource_Manufactured.xml
index 2fdefe79..6ad6a8bc 100644
--- a/Biotech/DefInjected/ThingDef/Items_Resource_Manufactured.xml
+++ b/Biotech/DefInjected/ThingDef/Items_Resource_Manufactured.xml
@@ -16,7 +16,7 @@
   <!-- EN: A molecular-restructing mechanoid micro-organ. It is necessary to produce certain advanced mechanoids and equipment.\n\nA mechanitor can study this chip to help unlock higher tiers of mechtech research. -->
   <NanostructuringChip.description>一种用于生产某些先进的装备和机械族的微型纳米重构机械部件。\n\n机械师可以通过调查这种芯片以解锁更高层次的机械研究项目。</NanostructuringChip.description>
   <!-- EN: By studying the {PARENT_label}, {STUDIER_labelShort} has acquired the insight needed for the research project(s) {RESEARCH}.\n\nYour researchers can now use research benches to begin researching how to actually use the technology. -->
-  <NanostructuringChip.comps.CompStudiable.completedLetterText>通过调查{PARENT_label}，{STUDIER_labelShort}获得了研究{RESEARCH}所必要的知识。\n\n你的研究人员现在可以使用研究工作台开始研究如何实际使用这项技术。</NanostructuringChip.comps.CompStudiable.completedLetterText>
+  <NanostructuringChip.comps.CompStudiable.completedLetterText>通过调查{PARENT_label}，{STUDIER_labelShort}获得了研究{research}所必要的知识。\n\n你的研究人员现在可以使用研究工作台开始研究如何实际使用这项技术。</NanostructuringChip.comps.CompStudiable.completedLetterText>
   <!-- EN: {PARENT_label} studied: {RESEARCH} unlocked -->
   <NanostructuringChip.comps.CompStudiable.completedLetterTitle>{PARENT_label}通过调查解锁了：{RESEARCH}。</NanostructuringChip.comps.CompStudiable.completedLetterTitle>
   
@@ -25,7 +25,7 @@
   <!-- EN: An energy-focusing mechanoid micro-organ. It is necessary to produce certain advanced types of mechanoids and equipment.\n\nA mechanitor can study this chip to help unlock higher tiers of mechtech research. -->
   <PowerfocusChip.description>一种用于生产某些先进的装备和机械族的微型能量汇聚机械部件。\n\n机械师可以通过调查这种芯片以解锁更高层次的机械研究项目。</PowerfocusChip.description>
   <!-- EN: By studying the {PARENT_label}, {STUDIER_labelShort} has acquired the insight needed for the research project(s) {RESEARCH}.\n\nYour researchers can now use research benches to begin researching how to actually use the technology. -->
-  <PowerfocusChip.comps.CompStudiable.completedLetterText>通过调查{PARENT_label}，{STUDIER_labelShort}获得了研究{RESEARCH}所必要的知识。\n\n你的研究人员现在可以使用研究工作台开始研究如何实际使用这项技术。</PowerfocusChip.comps.CompStudiable.completedLetterText>
+  <PowerfocusChip.comps.CompStudiable.completedLetterText>通过调查{PARENT_label}，{STUDIER_labelShort}获得了研究{research}所必要的知识。\n\n你的研究人员现在可以使用研究工作台开始研究如何实际使用这项技术。</PowerfocusChip.comps.CompStudiable.completedLetterText>
   <!-- EN: {PARENT_label} studied: {RESEARCH} unlocked -->
   <PowerfocusChip.comps.CompStudiable.completedLetterTitle>{PARENT_label}通过调查解锁了：{RESEARCH}。</PowerfocusChip.comps.CompStudiable.completedLetterTitle>
   
@@ -45,7 +45,7 @@
   <!-- EN: A mechanoid-band synchronization micro-organ. It is necessary to produce certain advanced types of mechanoids and equipment.\n\nA mechanitor can study this chip to help unlock higher tiers of mechtech research. -->
   <SignalChip.description>一种用于生产某些先进的装备和机械族的微型同步信号处理机械部件。\n\n机械师可以通过调查这种芯片以解锁更高层次的机械研究项目。</SignalChip.description>
   <!-- EN: By studying the {PARENT_label}, {STUDIER_labelShort} has acquired the insight needed for the research project(s) {RESEARCH}.\n\nYour researchers can now use research benches to begin researching how to actually use the technology. -->
-  <SignalChip.comps.CompStudiable.completedLetterText>通过调查{PARENT_label}，{STUDIER_labelShort}获得了研究{RESEARCH}所必要的知识。\n\n你的研究人员现在可以使用研究工作台开始研究如何实际使用这项技术。</SignalChip.comps.CompStudiable.completedLetterText>
+  <SignalChip.comps.CompStudiable.completedLetterText>通过调查{PARENT_label}，{STUDIER_labelShort}获得了研究{research}所必要的知识。\n\n你的研究人员现在可以使用研究工作台开始研究如何实际使用这项技术。</SignalChip.comps.CompStudiable.completedLetterText>
   <!-- EN: {PARENT_label} studied: {RESEARCH} unlocked -->
   <SignalChip.comps.CompStudiable.completedLetterTitle>{PARENT_label}通过调查解锁了：{RESEARCH}。</SignalChip.comps.CompStudiable.completedLetterTitle>
   
diff --git a/Core/DefInjected/RitualOutcomeEffectDef/Ritual_Outcomes.xml b/Core/DefInjected/RitualOutcomeEffectDef/Ritual_Outcomes.xml
index 81ba7890..8ca62e3e 100644
--- a/Core/DefInjected/RitualOutcomeEffectDef/Ritual_Outcomes.xml
+++ b/Core/DefInjected/RitualOutcomeEffectDef/Ritual_Outcomes.xml
@@ -10,7 +10,7 @@
   <!-- EN: participant count -->
   <AttendedSpeech.comps.1.label>参与者人数</AttendedSpeech.comps.1.label>
   <!-- EN: room impressiveness -->
-  <AttendedSpeech.comps.2.label>房间印象</AttendedSpeech.comps.2.label>
+  <AttendedSpeech.comps.2.label>房间观感</AttendedSpeech.comps.2.label>
   <!-- EN: Terrible -->
   <AttendedSpeech.outcomeChances.0.label>糟糕的</AttendedSpeech.outcomeChances.0.label>
   <!-- EN: Uninspiring -->
diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml
index db661dce..0cf854c0 100644
--- a/Core/Keyed/Misc_Gameplay.xml
+++ b/Core/Keyed/Misc_Gameplay.xml
@@ -837,7 +837,7 @@
   <!-- EN: digging up corpse. -->
   <ReportDiggingUpCorpse>正在挖出尸体。</ReportDiggingUpCorpse>
   <!-- EN: being carried by {0_labelShort}. -->
-  <CarriedBy>正在乘坐{0_labelShort}。</CarriedBy> 
+  <CarriedBy>正被{0_labelShort}持有。</CarriedBy> 
   <!-- EN: inside {0_labelShort}. -->
   <InContainer>在{0_labelShort}里。</InContainer> 
 
diff --git a/Ideology/DefInjected/RitualOutcomeEffectDef/Ritual_Outcomes.xml b/Ideology/DefInjected/RitualOutcomeEffectDef/Ritual_Outcomes.xml
index 031c455d..9f2e8e83 100644
--- a/Ideology/DefInjected/RitualOutcomeEffectDef/Ritual_Outcomes.xml
+++ b/Ideology/DefInjected/RitualOutcomeEffectDef/Ritual_Outcomes.xml
@@ -112,7 +112,7 @@
   <!-- EN: participant count -->
   <CelebratedDate_Consumable.comps.0.label>参与者数量</CelebratedDate_Consumable.comps.0.label>
   <!-- EN: room impressiveness -->
-  <CelebratedDate_Consumable.comps.1.label>房间印象</CelebratedDate_Consumable.comps.1.label>
+  <CelebratedDate_Consumable.comps.1.label>令人难忘的房间</CelebratedDate_Consumable.comps.1.label>
   <!-- EN: If the {0} is satisfying, one participant might gain an inspiration. -->
   <CelebratedDate_Consumable.extraPredictedOutcomeDescriptions.0>如果{0}令人满意， 一个参与者可能会获得灵感。</CelebratedDate_Consumable.extraPredictedOutcomeDescriptions.0>
   <!-- EN: Terrible -->
@@ -141,7 +141,7 @@
   <!-- EN: participant count -->
   <CelebrationPartyDanceDrum.comps.0.label>参与者数量</CelebrationPartyDanceDrum.comps.0.label>
   <!-- EN: room impressiveness -->
-  <CelebrationPartyDanceDrum.comps.1.label>房间印象</CelebrationPartyDanceDrum.comps.1.label>
+  <CelebrationPartyDanceDrum.comps.1.label>令人难忘的房间</CelebrationPartyDanceDrum.comps.1.label>
   <!-- EN: played drum count -->
   <CelebrationPartyDanceDrum.comps.2.label>敲鼓者数量</CelebrationPartyDanceDrum.comps.2.label>
   <!-- EN: started at campfire -->
@@ -176,7 +176,7 @@
   <!-- EN: participant count -->
   <CelebrationPartyDanceTech.comps.0.label>参与者数量</CelebrationPartyDanceTech.comps.0.label>
   <!-- EN: room impressiveness -->
-  <CelebrationPartyDanceTech.comps.1.label>房间印象</CelebrationPartyDanceTech.comps.1.label>
+  <CelebrationPartyDanceTech.comps.1.label>令人难忘的房间</CelebrationPartyDanceTech.comps.1.label>
   <!-- EN: active speaker count -->
   <CelebrationPartyDanceTech.comps.2.label>通电的音响数量</CelebrationPartyDanceTech.comps.2.label>
   <!-- EN: started at lightball -->
@@ -247,7 +247,7 @@
   <!-- EN: If it goes well, target's ideoligion certainty will be reduced or they will convert. If it goes badly, they will gain certainty in their old beliefs. -->
   <Conversion.description>如果进展顺利，目标的文化形态认可度将会降低，或者他们将会改变信仰。如果进展不顺利，他们会对自己的旧信仰更加坚定。</Conversion.description>
   <!-- EN: room impressiveness -->
-  <Conversion.comps.0.label>房间印象</Conversion.comps.0.label>
+  <Conversion.comps.0.label>令人难忘的房间</Conversion.comps.0.label>
   <!-- EN: participant count -->
   <Conversion.comps.1.label>参与者数量</Conversion.comps.1.label>
   <!-- EN: {PAWN_labelShort}'s social impact -->
@@ -280,7 +280,7 @@
   <!-- EN: participant count -->
   <DestroyConsumableBuilding.comps.0.label>参与者数量</DestroyConsumableBuilding.comps.0.label>
   <!-- EN: room impressiveness -->
-  <DestroyConsumableBuilding.comps.1.label>房间印象</DestroyConsumableBuilding.comps.1.label>
+  <DestroyConsumableBuilding.comps.1.label>令人印象深刻的房间</DestroyConsumableBuilding.comps.1.label>
   <!-- EN: Terrible -->
   <DestroyConsumableBuilding.outcomeChances.0.label>糟糕的</DestroyConsumableBuilding.outcomeChances.0.label>
   <!-- EN: The {0} was terrible! Participants endured hours of jaw-clenching small talk while waiting for it to end. -->
@@ -307,7 +307,7 @@
   <!-- EN: participant count -->
   <DestroyConsumableBuilding_Burnbong.comps.0.label>参与者数量</DestroyConsumableBuilding_Burnbong.comps.0.label>
   <!-- EN: room impressiveness -->
-  <DestroyConsumableBuilding_Burnbong.comps.1.label>房间印象</DestroyConsumableBuilding_Burnbong.comps.1.label>
+  <DestroyConsumableBuilding_Burnbong.comps.1.label>令人印象深刻的房间</DestroyConsumableBuilding_Burnbong.comps.1.label>
   <!-- EN: Terrible -->
   <DestroyConsumableBuilding_Burnbong.outcomeChances.0.label>糟糕的</DestroyConsumableBuilding_Burnbong.outcomeChances.0.label>
   <!-- EN: The {0} was terrible! Participants endured hours of jaw-clenching small talk while waiting for it to end. -->
@@ -334,7 +334,7 @@
   <!-- EN: participant count -->
   <DestroyConsumableBuilding_CannibalPlatter.comps.0.label>参与者数量</DestroyConsumableBuilding_CannibalPlatter.comps.0.label>
   <!-- EN: room impressiveness -->
-  <DestroyConsumableBuilding_CannibalPlatter.comps.1.label>房间印象</DestroyConsumableBuilding_CannibalPlatter.comps.1.label>
+  <DestroyConsumableBuilding_CannibalPlatter.comps.1.label>令人印象深刻的房间</DestroyConsumableBuilding_CannibalPlatter.comps.1.label>
   <!-- EN: Terrible -->
   <DestroyConsumableBuilding_CannibalPlatter.outcomeChances.0.label>糟糕的</DestroyConsumableBuilding_CannibalPlatter.outcomeChances.0.label>
   <!-- EN: The {0} was terrible! Participants endured hours of jaw-clenching small talk while waiting for it to end. -->
@@ -361,7 +361,7 @@
   <!-- EN: participant count -->
   <DestroyConsumableBuilding_ChristmasTree.comps.0.label>参与者数量</DestroyConsumableBuilding_ChristmasTree.comps.0.label>
   <!-- EN: room impressiveness -->
-  <DestroyConsumableBuilding_ChristmasTree.comps.1.label>房间印象</DestroyConsumableBuilding_ChristmasTree.comps.1.label>
+  <DestroyConsumableBuilding_ChristmasTree.comps.1.label>令人印象深刻的房间</DestroyConsumableBuilding_ChristmasTree.comps.1.label>
   <!-- EN: Terrible -->
   <DestroyConsumableBuilding_ChristmasTree.outcomeChances.0.label>糟糕的</DestroyConsumableBuilding_ChristmasTree.outcomeChances.0.label>
   <!-- EN: The {0} was terrible! Participants endured hours of jaw-clenching small talk while waiting for it to end. -->
@@ -388,7 +388,7 @@
   <!-- EN: participant count -->
   <DestroyConsumableBuilding_Pyre.comps.0.label>参与者数量</DestroyConsumableBuilding_Pyre.comps.0.label>
   <!-- EN: room impressiveness -->
-  <DestroyConsumableBuilding_Pyre.comps.1.label>房间印象</DestroyConsumableBuilding_Pyre.comps.1.label>
+  <DestroyConsumableBuilding_Pyre.comps.1.label>令人印象深刻的房间</DestroyConsumableBuilding_Pyre.comps.1.label>
   <!-- EN: Terrible -->
   <DestroyConsumableBuilding_Pyre.outcomeChances.0.label>糟糕的</DestroyConsumableBuilding_Pyre.outcomeChances.0.label>
   <!-- EN: The {0} was terrible! Participants endured hours of jaw-clenching small talk while waiting for it to end. -->