From cdff763952d90181e676c3e01b95162d5569378e Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Thu, 7 Oct 2021 14:00:34 +0800
Subject: [PATCH] update 3144

---
 Core/DefInjected/JobDef/Jobs_Work.xml         |  4 +--
 Core/DefInjected/ThingDef/Buildings_Misc.xml  |  8 ++---
 Core/DefInjected/TipSetDef/Tips.xml           |  8 ++---
 Core/Keyed/Alerts.xml                         |  8 ++---
 .../HistoryEventDef/Precepts_Charity.xml      |  6 ++++
 .../ThoughtDef/Precepts_Charity.xml           | 30 +++++++++++++++++++
 Ideology/Keyed/Dialog_StatsReports.xml        |  3 ++
 7 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/Core/DefInjected/JobDef/Jobs_Work.xml b/Core/DefInjected/JobDef/Jobs_Work.xml
index da09e3ea..88f514e3 100644
--- a/Core/DefInjected/JobDef/Jobs_Work.xml
+++ b/Core/DefInjected/JobDef/Jobs_Work.xml
@@ -124,8 +124,8 @@
   <!-- EN: researching. -->
   <Research.reportString>正在研究中。</Research.reportString>
   
-  <!-- EN: leading TargetA to hitching post. -->
-  <RopeRoamerToHitchingPost.reportString>正在带领TargetA去牵引桩。</RopeRoamerToHitchingPost.reportString>
+  <!-- EN: leading TargetA to hitching spot. -->
+  <RopeRoamerToHitchingPost.reportString>正在带领TargetA去牵引点。</RopeRoamerToHitchingPost.reportString>
   
   <!-- EN: leading TargetA to TargetC. -->
   <RopeRoamerToUnenclosedPen.reportString>正在带领TargetA去TargetC。</RopeRoamerToUnenclosedPen.reportString>
diff --git a/Core/DefInjected/ThingDef/Buildings_Misc.xml b/Core/DefInjected/ThingDef/Buildings_Misc.xml
index 63de5fef..04f22f27 100644
--- a/Core/DefInjected/ThingDef/Buildings_Misc.xml
+++ b/Core/DefInjected/ThingDef/Buildings_Misc.xml
@@ -6,10 +6,10 @@
   <!-- EN: This cryptosleep casket looks like it has been here for a very long time. Who knows what it might contain? -->
   <AncientCryptosleepCasket.description>这个低温休眠舱看起来已经在这里有很长时间了。谁知道这里边装着什么？</AncientCryptosleepCasket.description>
   
-  <!-- EN: caravan hitching post -->
-  <CaravanHitchingPost.label>远行队牵引桩</CaravanHitchingPost.label>
-  <!-- EN: Designates a point for hitching animals. Used to keep pack animals in place when forming a caravan while gear is loaded. Also can be used to keep certain animals from wandering around while at sites your caravans travel to. -->
-  <CaravanHitchingPost.description>指定一个拴牲畜的地点，用于在组建远行队时保持载货动物的位置以方便装载货物。也可以用于防止某些远行队中不听话的动物四处游荡。</CaravanHitchingPost.description>
+  <!-- EN: caravan hitching spot -->
+  <CaravanPackingSpot.label>远行队牵引点</CaravanPackingSpot.label>
+  <!-- EN: Designates a spot for hitching animals and forming caravans. Used to keep pack animals in place when forming a caravan while gear is loaded. Also can be used to keep certain animals from wandering around the sites your caravans travel to. -->
+  <CaravanPackingSpot.description>指定一个拴牲畜的地点，用于在组建远行队时保持载货动物的位置以方便装载货物。也可以用于防止某些远行队中不听话的动物四处游荡。</CaravanPackingSpot.description>
   
   <!-- EN: comms console -->
   <CommsConsole.label>通讯台</CommsConsole.label>
diff --git a/Core/DefInjected/TipSetDef/Tips.xml b/Core/DefInjected/TipSetDef/Tips.xml
index 76773add..8c9223bb 100644
--- a/Core/DefInjected/TipSetDef/Tips.xml
+++ b/Core/DefInjected/TipSetDef/Tips.xml
@@ -53,10 +53,10 @@
   <GameplayTips.AnimalDeathExplosionRain>你可以在下雨的时候捕猎会爆炸的动物，它们死后的爆炸不会引起森林大火。</GameplayTips.AnimalDeathExplosionRain>
   <!-- EN: Carefully-slaughtered animals yield more meat and leather than those who were killed violently. -->
   <GameplayTips.GreaterSlaughterYield>精心宰杀的动物比那些被粗暴杀死的动物产出的肉和皮革都要更多一些。</GameplayTips.GreaterSlaughterYield>
-  <!-- EN: Place a caravan hitching post to designate where you want your caravans to form up. Usually near a storage area is good. -->
-  <GameplayTips.CaravanHitchingPost>在你想要组建远行队的位置放置一个远行队牵引桩。一般来说靠近储存区会比较好。</GameplayTips.CaravanHitchingPost>
-  <!-- EN: Place a caravan hitching post on sites your caravans travel to if you want to keep roaming animals in a specific area. -->
-  <GameplayTips.CaravanHitchingPostRoamers>如果你想把游荡的动物控制在一个特定的区域内，就在你的远行队所到的地点放置一个远行队牵引桩。</GameplayTips.CaravanHitchingPostRoamers>
+  <!-- EN: Place a caravan hitching spot to designate where you want your caravans to form up. Usually placing one near storage areas is good. -->
+  <GameplayTips.CaravanHitchingSpot>在你想要组建远行队的位置放置一个远行队牵引点。一般来说靠近储存区的位置有一个会比较好。</GameplayTips.CaravanHitchingSpot>
+  <!-- EN: Place a caravan hitching spot on sites your caravans travel to if you want to keep roaming animals in a specific area. -->
+  <GameplayTips.CaravanHitchingSpotRoamers>如果你想把游荡的动物控制在一个特定的区域内，就在你的远行队所到的地点放置一个远行队牵引桩。</GameplayTips.CaravanHitchingSpotRoamers>
   <!-- EN: Single-person caravans can be very useful in certain situations. -->
   <GameplayTips.CaravanSinglePerson>某些情况下，单人远行队是更好的选择。</GameplayTips.CaravanSinglePerson>
   <!-- EN: Caravans move faster if they include rideable animals like horses, donkeys and dromedaries. -->
diff --git a/Core/Keyed/Alerts.xml b/Core/Keyed/Alerts.xml
index d95b8c90..2fca41e5 100644
--- a/Core/Keyed/Alerts.xml
+++ b/Core/Keyed/Alerts.xml
@@ -262,8 +262,8 @@
 
   <!-- EN: Pen needed -->
   <AlertAnimalPenNeeded>需要畜栏</AlertAnimalPenNeeded>
-  <!-- EN: Some of your tame animals are roamers. If not kept in an animal pen or roped to a hitching post, they will wander away. -->
-  <AlertAnimalPenNeededDesc>你的一些驯服的动物正在游荡。如果不把它们关在畜栏里或者拴在牵引桩上，它们就会到处乱跑。</AlertAnimalPenNeededDesc><!--text_todo-->
+  <!-- EN: Some of your tame animals are roamers. If not kept in an animal pen or roped to a hitching spot, they will wander away. -->
+  <AlertAnimalPenNeededDesc>你的一些驯服的动物正在游荡。如果不把它们关在畜栏里或者拴在牵引点，它们就会到处乱跑。</AlertAnimalPenNeededDesc><!--text_todo-->
   <!-- EN: You do not have any handlers to take animals to a pen.\n\nAssign a colonist to the Handling work type. -->
   <AlertAnimalPenNeededNoHandlers>你没有任何饲养员可以把动物带到畜栏。\n\n指定一个殖民者分配到可以处理的工作类型。</AlertAnimalPenNeededNoHandlers>
   <!-- EN: Create an animal pen by building a pen marker inside a fenced, barricaded, or walled area. Select the pen marker to see which animals it accepts and how many its pen can support.\n\nYour animal handlers will bring animals to their assigned pen automatically.\n\nA pen needs a door or gate to admit animals. -->
@@ -291,8 +291,8 @@
 
   <!-- EN: Hungry hitched animal -->
   <AlertHitchedAnimalHungryNoFood>饥饿的拴固动物</AlertHitchedAnimalHungryNoFood><!--text_todo-->
-  <!-- EN: Some animals tied to hitching posts are hungry. There may not be any suitable food within their reach.\n\nThey can be brought food or the hitching post can be removed to allow them to roam and find food on their own.\n\nThe following hitched animals are hungry:\n\n{0} -->
-  <AlertHitchedAnimalHungryNoFoodDesc>一些被绑在牵引桩上的动物正在挨饿。它们的旁边可能没有任何合适的食物。\n\n你可以将食物喂给它们、放在它们脚边或者拆掉牵引桩让它们自己去觅食。\n\n这些动物正在挨饿：\n\n{0}</AlertHitchedAnimalHungryNoFoodDesc><!--text_todo-->
+  <!-- EN: Some animals tied to hitching spots are hungry. There may not be any suitable food within their reach.\n\nThey can be brought food or the hitching spot can be removed to allow them to roam and find food on their own.\n\nThe following hitched animals are hungry:\n\n{0} -->
+  <AlertHitchedAnimalHungryNoFoodDesc>一些被绑在牵引点的动物正在挨饿。它们的旁边可能没有任何合适的食物。\n\n你可以将食物喂给它们、放在它们脚边或者取消牵引点让它们自己去觅食。\n\n这些动物正在挨饿：\n\n{0}</AlertHitchedAnimalHungryNoFoodDesc><!--text_todo-->
 
   <!-- EN: Raids arriving in {0} -->
   <AlertTimedRaidsArrivingIn>袭击将在{0}到来</AlertTimedRaidsArrivingIn>
diff --git a/Ideology/DefInjected/HistoryEventDef/Precepts_Charity.xml b/Ideology/DefInjected/HistoryEventDef/Precepts_Charity.xml
index c6242509..af569fcd 100644
--- a/Ideology/DefInjected/HistoryEventDef/Precepts_Charity.xml
+++ b/Ideology/DefInjected/HistoryEventDef/Precepts_Charity.xml
@@ -34,6 +34,12 @@
   <!-- EN: wimp refused -->
   <CharityRefused_IntroWimp.label>拒绝了懦夫</CharityRefused_IntroWimp.label>
   
+  <!-- EN: pilgrims refused -->
+  <CharityRefused_Pilgrims.label>拒绝了朝圣者</CharityRefused_Pilgrims.label>
+  
+  <!-- EN: pilgrims betrayed -->
+  <CharityRefused_Pilgrims_Betrayed.label>背叛了朝圣者</CharityRefused_Pilgrims_Betrayed.label>
+  
   <!-- EN: refugee pod crash refused -->
   <CharityRefused_RefugeePodCrash.label>拒绝了难民</CharityRefused_RefugeePodCrash.label>
   
diff --git a/Ideology/DefInjected/ThoughtDef/Precepts_Charity.xml b/Ideology/DefInjected/ThoughtDef/Precepts_Charity.xml
index 0bca6135..de17b8e0 100644
--- a/Ideology/DefInjected/ThoughtDef/Precepts_Charity.xml
+++ b/Ideology/DefInjected/ThoughtDef/Precepts_Charity.xml
@@ -126,6 +126,16 @@
   <!-- EN: We refused to help a desperate noble. It was deeply immoral. -->
   <CharityRefused_Essential_IntroWimp.stages.noble_not_helped.description>我们拒绝帮助一位绝望的贵族。这是非常不道德的。</CharityRefused_Essential_IntroWimp.stages.noble_not_helped.description>
   
+  <!-- EN: pilgrims not helped -->
+  <CharityRefused_Essential_Pilgrims.stages.pilgrims_not_helped.label>未帮助朝圣者</CharityRefused_Essential_Pilgrims.stages.pilgrims_not_helped.label>
+  <!-- EN: They asked to view our sacred relic and we refused. How could we be so selfish? -->
+  <CharityRefused_Essential_Pilgrims.stages.pilgrims_not_helped.description>他们想要瞻仰我们的圣物，我们拒绝了。我们怎么能如此自私？</CharityRefused_Essential_Pilgrims.stages.pilgrims_not_helped.description>
+  
+  <!-- EN: pilgrims betrayed -->
+  <CharityRefused_Essential_Pilgrims_Betrayed.stages.pilgrims_betrayed.label>背叛了朝圣者</CharityRefused_Essential_Pilgrims_Betrayed.stages.pilgrims_betrayed.label>
+  <!-- EN: They asked to view our sacred relic and we betrayed them. How did we get this depraved? -->
+  <CharityRefused_Essential_Pilgrims_Betrayed.stages.pilgrims_betrayed.description>他们想要瞻仰我们的圣物，而我们却背叛了他们。我们怎么会变得如此堕落？</CharityRefused_Essential_Pilgrims_Betrayed.stages.pilgrims_betrayed.description>
+  
   <!-- EN: crashed refugee not helped -->
   <CharityRefused_Essential_RefugeePodCrash.stages.crashed_refugee_not_helped.label>未帮助坠毁者</CharityRefused_Essential_RefugeePodCrash.stages.crashed_refugee_not_helped.label>
   <!-- EN: They were hurt and need of help, and we didn't help. How can I live with that? -->
@@ -166,6 +176,16 @@
   <!-- EN: We refused to help a desperate noble. We should have tried harder. -->
   <CharityRefused_Important_IntroWimp.stages.noble_not_helped.description>我们未能帮助一位绝望的贵族。我们应该更加努力。</CharityRefused_Important_IntroWimp.stages.noble_not_helped.description>
   
+  <!-- EN: pilgrims not helped -->
+  <CharityRefused_Important_Pilgrims.stages.pilgrims_not_helped.label>未帮助朝圣者</CharityRefused_Important_Pilgrims.stages.pilgrims_not_helped.label>
+  <!-- EN: They asked to view our sacred relic and we refused. We need to change our ways. -->
+  <CharityRefused_Important_Pilgrims.stages.pilgrims_not_helped.description>他们想要瞻仰我们的圣物，我们拒绝了。我们需要改变态度。</CharityRefused_Important_Pilgrims.stages.pilgrims_not_helped.description>
+  
+  <!-- EN: pilgrims betrayed -->
+  <CharityRefused_Important_Pilgrims_Betrayed.stages.pilgrims_betrayed.label>背叛了朝圣者</CharityRefused_Important_Pilgrims_Betrayed.stages.pilgrims_betrayed.label>
+  <!-- EN: They asked to view our sacred relic and we betrayed them. What a monstrous act. -->
+  <CharityRefused_Important_Pilgrims_Betrayed.stages.pilgrims_betrayed.description>他们想要瞻仰我们的圣物，而我们却背叛了他们。多么畸形的行为。</CharityRefused_Important_Pilgrims_Betrayed.stages.pilgrims_betrayed.description>
+  
   <!-- EN: crashed refugee not helped -->
   <CharityRefused_Important_RefugeePodCrash.stages.crashed_refugee_not_helped.label>未帮助坠毁者</CharityRefused_Important_RefugeePodCrash.stages.crashed_refugee_not_helped.label>
   <!-- EN: They were hurt and need of help, and we didn't help. Am I even a good person? -->
@@ -206,6 +226,16 @@
   <!-- EN: We refused to help a desperate noble. Perhaps I am not as charitable as I thought. -->
   <CharityRefused_Worthwhile_IntroWimp.stages.noble_not_helped.description>我们拒绝帮助一位绝望的贵族。或许我们并没有我想象中的那么仁慈。</CharityRefused_Worthwhile_IntroWimp.stages.noble_not_helped.description>
   
+  <!-- EN: pilgrims not helped -->
+  <CharityRefused_Worthwhile_Pilgrims.stages.pilgrims_not_helped.label>未帮助朝圣者</CharityRefused_Worthwhile_Pilgrims.stages.pilgrims_not_helped.label>
+  <!-- EN: They asked to view our sacred relic and we refused. We should be trying harder. -->
+  <CharityRefused_Worthwhile_Pilgrims.stages.pilgrims_not_helped.description>他们想要瞻仰我们的圣物，我们拒绝了。我们应该更重视一点。</CharityRefused_Worthwhile_Pilgrims.stages.pilgrims_not_helped.description>
+  
+  <!-- EN: pilgrims betrayed -->
+  <CharityRefused_Worthwhile_Pilgrims_Betrayed.stages.pilgrims_betrayed.label>背叛了朝圣者</CharityRefused_Worthwhile_Pilgrims_Betrayed.stages.pilgrims_betrayed.label>
+  <!-- EN: They asked to view our sacred relic and we betrayed them. We must do better. -->
+  <CharityRefused_Worthwhile_Pilgrims_Betrayed.stages.pilgrims_betrayed.description>他们想要瞻仰我们的圣物，而我们却背叛了他们。我们应当做得更好。</CharityRefused_Worthwhile_Pilgrims_Betrayed.stages.pilgrims_betrayed.description>
+  
   <!-- EN: crashed refugee not helped -->
   <CharityRefused_Worthwhile_RefugeePodCrash.stages.crashed_refugee_not_helped.label>未帮助坠毁者</CharityRefused_Worthwhile_RefugeePodCrash.stages.crashed_refugee_not_helped.label>
   <!-- EN: They were hurt and need of help, and we didn't help. It wasn't the best. -->
diff --git a/Ideology/Keyed/Dialog_StatsReports.xml b/Ideology/Keyed/Dialog_StatsReports.xml
index cac9258e..b374ab1a 100644
--- a/Ideology/Keyed/Dialog_StatsReports.xml
+++ b/Ideology/Keyed/Dialog_StatsReports.xml
@@ -57,4 +57,7 @@
   <!-- EN: Biosculpting speed -->
   <StatsReport_BiosculptingSpeedFactor>塑形速度</StatsReport_BiosculptingSpeedFactor>
 
+  <!-- EN: The amount of progress that has been made towards hacking this object. -->
+  <Stat_Thing_HackingProgress>破解此物体的进度。</Stat_Thing_HackingProgress><!-- text_todo -->
+
   </LanguageData>
\ No newline at end of file