From 1db78b5c6e77a206aef77a0b30807873e41f56e8 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Fri, 20 Mar 2020 22:40:38 +0800
Subject: [PATCH] update 2578

---
 Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml   | 2 +-
 .../QuestScriptDef/Scripts_Utility_RewardsCore.xml        | 2 +-
 Core/DefInjected/RulePackDef/RulePacks_CombatIncludes.xml | 2 +-
 Core/DefInjected/ThingCategoryDef/ThingCategories.xml     | 2 +-
 Core/Keyed/Letters.xml                                    | 2 +-
 Core/Keyed/Messages.xml                                   | 8 ++++++--
 Core/Keyed/Misc_Gameplay.xml                              | 4 ++--
 .../QuestScriptDef/Script_Hospitality_Root_Joiners.xml    | 2 +-
 .../QuestScriptDef/Script_Hospitality_Worker.xml          | 4 +---
 Royalty/DefInjected/ThingDef/MeleeBladelink.xml           | 6 +++---
 Royalty/Keyed/Dialogs_Various.xml                         | 2 +-
 11 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml b/Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml
index 9b0a15e5..a7b5a59b 100644
--- a/Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml
+++ b/Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml
@@ -47,7 +47,7 @@
   
   <!-- EN: gut worms -->
   <GutWorms.label>肠道蠕虫</GutWorms.label>
-  <!-- EN: Parasitic worms in the gut. They cause vomiting. They also consuming the victim's food, which increases hunger. -->
+  <!-- EN: Parasitic worms in the gut. They cause vomiting. They also consume the victim's food, which increases hunger. -->
   <GutWorms.description>由肠道中的寄生虫引起的疾病。患者会因为营养流失变的更容易饥饿。</GutWorms.description>
   
   <!-- EN: malaria -->
diff --git a/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml b/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml
index 6b1e47c5..4a646a6f 100644
--- a/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml
+++ b/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
diff --git a/Core/DefInjected/RulePackDef/RulePacks_CombatIncludes.xml b/Core/DefInjected/RulePackDef/RulePacks_CombatIncludes.xml
index d7bda9b4..af3486de 100644
--- a/Core/DefInjected/RulePackDef/RulePacks_CombatIncludes.xml
+++ b/Core/DefInjected/RulePackDef/RulePacks_CombatIncludes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
diff --git a/Core/DefInjected/ThingCategoryDef/ThingCategories.xml b/Core/DefInjected/ThingCategoryDef/ThingCategories.xml
index 6625c8cb..bdb62b88 100644
--- a/Core/DefInjected/ThingCategoryDef/ThingCategories.xml
+++ b/Core/DefInjected/ThingCategoryDef/ThingCategories.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: animal products -->
diff --git a/Core/Keyed/Letters.xml b/Core/Keyed/Letters.xml
index a47bc587..a43e6d30 100644
--- a/Core/Keyed/Letters.xml
+++ b/Core/Keyed/Letters.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Misc -->
diff --git a/Core/Keyed/Messages.xml b/Core/Keyed/Messages.xml
index 33216208..4ace0065 100644
--- a/Core/Keyed/Messages.xml
+++ b/Core/Keyed/Messages.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- EN: Sieging {0} from {1} are assaulting the colony. -->
@@ -466,7 +466,7 @@
   <!-- EN: used {ITEM_labelShort} on {TARGET_labelShort} -->
   <GoodwillChangedReason_UsedItem>对{TARGET_labelShort}使用了{ITEM_labelShort}</GoodwillChangedReason_UsedItem>
   <!-- EN: used {0} on {1} -->
-  <GoodwillChangedReason_UsedAbility>在 {0} 上使用 {1}</GoodwillChangedReason_UsedAbility>
+  <GoodwillChangedReason_UsedAbility>对 {1} 使用 {0}</GoodwillChangedReason_UsedAbility>
   <!-- EN: harvested {0} -->
   <GoodwillChangedReason_RemovedBodyPart>割取了{0}的器官</GoodwillChangedReason_RemovedBodyPart>
   <!-- EN: removed {0} -->
@@ -503,6 +503,10 @@
   <GoodwillChangedReason_SoldPawn>出售{0_labelShort} </GoodwillChangedReason_SoldPawn>
   <!-- EN: euthanized {PAWN_labelShort} -->
   <GoodwillChangedReason_EuthanizedPawn>安乐死 {PAWN_labelShort}</GoodwillChangedReason_EuthanizedPawn>
+  <!-- EN: requested military aid -->
+  <GoodwillChangedReason_RequestedMilitaryAid>TODO</GoodwillChangedReason_RequestedMilitaryAid>
+  <!-- EN: requested trader caravan -->
+  <GoodwillChangedReason_RequestedTrader>TODO</GoodwillChangedReason_RequestedTrader>
 
   <!-- EN: {0} accept your gift but they don't appreciate it. -->
   <MessageGiftGivenButNotAppreciated>{0}接受了你的礼物，但并无谢意。</MessageGiftGivenButNotAppreciated>
diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml
index 9d96163a..3dfe8010 100644
--- a/Core/Keyed/Misc_Gameplay.xml
+++ b/Core/Keyed/Misc_Gameplay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Various -->
@@ -601,7 +601,7 @@
   <!-- EN: watching the aurora. -->
   <WatchingAurora>看极光。</WatchingAurora>
   <!-- EN: using {0} on {1}. -->
-  <UsingVerb>在{1}上使用{0}。</UsingVerb>
+  <UsingVerb>对{1}使用{0}。</UsingVerb>
   <!-- EN: area -->
   <AreaLower>区域</AreaLower>
   <!-- EN: cowering. -->
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
index c16d0473..42bc28cf 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
index 2a5b40c4..a13674d9 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: [lodgersLabelSingOrPlural] arrived -->
@@ -31,8 +31,6 @@
   <Hospitality_Util_Worker.root.nodes.lodgersLeftMap.node.nodes.Letter.label.slateRef>访客失踪：{SUBJECT_definite}</Hospitality_Util_Worker.root.nodes.lodgersLeftMap.node.nodes.Letter.label.slateRef>
   <!-- EN: [letterSubject], who you were charged to protect, is gone. [remainingWillNowLeave][failLetterEndingCommon] -->
   <Hospitality_Util_Worker.root.nodes.lodgersLeftMap.node.nodes.Letter.text.slateRef>指定由你保护的[letterSubject]不见了。[remainingWillNowLeave][failLetterEndingCommon]</Hospitality_Util_Worker.root.nodes.lodgersLeftMap.node.nodes.Letter.text.slateRef>
-  <!-- EN: Guest lost: {SUBJECT_definite} -->
-  <Hospitality_Util_Worker.root.nodes.AnySignal.node.node.nodes.Letter.label.slateRef>访客失踪：{SUBJECT_definite}</Hospitality_Util_Worker.root.nodes.AnySignal.node.node.nodes.Letter.label.slateRef>
   <!-- EN: [letterSubject], who you were charged to protect, has joined another faction. [remainingWillNowLeave][failLetterEndingCommon] -->
   <Hospitality_Util_Worker.root.nodes.AnySignal.node.node.nodes.Letter.text.slateRef>指定由你保护的[letterSubject]已经加入了另一个派系。[remainingWillNowLeave][failLetterEndingCommon]</Hospitality_Util_Worker.root.nodes.AnySignal.node.node.nodes.Letter.text.slateRef>
   <!-- EN: Shuttle destroyed -->
diff --git a/Royalty/DefInjected/ThingDef/MeleeBladelink.xml b/Royalty/DefInjected/ThingDef/MeleeBladelink.xml
index 354d97db..deebab53 100644
--- a/Royalty/DefInjected/ThingDef/MeleeBladelink.xml
+++ b/Royalty/DefInjected/ThingDef/MeleeBladelink.xml
@@ -3,7 +3,7 @@
   
   <!-- EN: link monosword -->
   <MeleeWeapon_MonoSwordBladelink.label>Δ'单分子剑</MeleeWeapon_MonoSwordBladelink.label>
-  <!-- EN: A crystal-metallic longsword infused with mechanites that maintain a mono-molecular cutting edge. It cuts through even thick armor with ease, while its light weight and onboard persona permit extremely fast attacks.\n\nThis weapon has an onboard persona that can bond to only a single person. The wielder and intelligent weapon can synchronize their reflexes and attack with freightening speed, accuracy, and creativity. Once bonded to a wielder, the weapon's persona will refuse to be wielded by anyone else. -->
+  <!-- EN: A crystal-metallic longsword infused with mechanites that maintain a mono-molecular cutting edge. It cuts through even thick armor with ease, while its light weight and onboard persona permit extremely fast attacks.\n\nThis weapon has an onboard persona that can bond to only a single person. The wielder and intelligent weapon can synchronize their reflexes and attack with frightening speed, accuracy, and creativity. Once bonded to a wielder, the weapon's persona will refuse to be wielded by anyone else. -->
   <MeleeWeapon_MonoSwordBladelink.description>一把单分子晶金长剑，它的单分子刃部依靠自身附带的纳米机械进行维护。可以轻易的洞穿任何重型盔甲，而且轻便灵活，攻击速度很快。\n\n这件武器自身具备智能人格只能与一名使用者进行绑定。持有者和智能武器可以同调两者之间的本能反应以及攻击步调、准确性、创造力。一但与持有者绑定，这件武器的智能人格将拒绝其它人的使用。</MeleeWeapon_MonoSwordBladelink.description>
   <!-- EN: handle -->
   <MeleeWeapon_MonoSwordBladelink.tools.handle.label>剑柄</MeleeWeapon_MonoSwordBladelink.tools.handle.label>
@@ -14,7 +14,7 @@
   
   <!-- EN: link plasmasword -->
   <MeleeWeapon_PlasmaSwordBladelink.label>Δ'等离子剑</MeleeWeapon_PlasmaSwordBladelink.label>
-  <!-- EN: A metal-cored sword with a cutting edge. Plasma is wrapped around the core, held in place by an energy field. Targets are both sliced by the metal core, as well as burned or ignited by the plasma sheath.\n\nThis weapon has an onboard persona that can bond to only a single person. The wielder and intelligent weapon can synchronize their reflexes and attack with freightening speed, accuracy, and creativity. Once bonded to a wielder, the weapon's persona will refuse to be wielded by anyone else. -->
+  <!-- EN: A metal-cored sword with a cutting edge. Plasma is wrapped around the core, held in place by an energy field. Targets are both sliced by the metal core, as well as burned or ignited by the plasma sheath.\n\nThis weapon has an onboard persona that can bond to only a single person. The wielder and intelligent weapon can synchronize their reflexes and attack with frightening speed, accuracy, and creativity. Once bonded to a wielder, the weapon's persona will refuse to be wielded by anyone else. -->
   <MeleeWeapon_PlasmaSwordBladelink.description>这是一把锐利的金属剑，它的剑身被由能量力场约束的等离子体包裹着。攻击目标时对方在承受剑刃的伤害的同时也会被等离子体灼伤或点燃。\n\n这件武器自身具备智能人格只能与一名使用者进行绑定。持有者和智能武器可以同调两者之间的本能反应以及攻击步调、准确性、创造力。一但与持有者绑定，这件武器的智能人格将拒绝其它人的使用。</MeleeWeapon_PlasmaSwordBladelink.description>
   <!-- EN: handle -->
   <MeleeWeapon_PlasmaSwordBladelink.tools.handle.label>剑柄</MeleeWeapon_PlasmaSwordBladelink.tools.handle.label>
@@ -25,7 +25,7 @@
   
   <!-- EN: link zeushammer -->
   <MeleeWeapon_ZeusHammerBladelink.label>Δ'宙斯锤</MeleeWeapon_ZeusHammerBladelink.label>
-  <!-- EN: A warhammer with an embedded EMP capacitor. Upon impact, it blasts the target with an EMP burst in addition to the physical damage.\n\nThis weapon has an onboard persona that can bond to only a single person. The wielder and intelligent weapon can synchronize their reflexes and attack with freightening speed, accuracy, and creativity. Once bonded to a wielder, the weapon's persona will refuse to be wielded by anyone else. -->
+  <!-- EN: A warhammer with an embedded EMP capacitor. Upon impact, it blasts the target with an EMP burst in addition to the physical damage.\n\nThis weapon has an onboard persona that can bond to only a single person. The wielder and intelligent weapon can synchronize their reflexes and attack with frightening speed, accuracy, and creativity. Once bonded to a wielder, the weapon's persona will refuse to be wielded by anyone else. -->
   <MeleeWeapon_ZeusHammerBladelink.description>一把内置EMP装置的战锤，被它击中时，除了会受到物理伤害，同时还附带EMP冲击。\n\n这件武器自身具备智能人格只能与一名使用者进行绑定。持有者和智能武器可以同调两者之间的本能反应以及攻击步调、准确性、创造力。一但与持有者绑定，这件武器的智能人格将拒绝其它人的使用。</MeleeWeapon_ZeusHammerBladelink.description>
   <!-- EN: handle -->
   <MeleeWeapon_ZeusHammerBladelink.tools.handle.label>锤柄</MeleeWeapon_ZeusHammerBladelink.tools.handle.label>
diff --git a/Royalty/Keyed/Dialogs_Various.xml b/Royalty/Keyed/Dialogs_Various.xml
index 9d763bc0..70bd50cd 100644
--- a/Royalty/Keyed/Dialogs_Various.xml
+++ b/Royalty/Keyed/Dialogs_Various.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Royal Titles -->