From c2cf1c58d3e36cad451dcc2c354d670b297ff89c Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Mon, 2 Mar 2020 21:12:47 +0800
Subject: [PATCH] update to 1.1.2561

---
 Core/Backstories/Backstories.xml                       |  2 +-
 Core/DefInjected/BodyDef/Bodies_Mechanoid.xml          |  4 ++--
 Core/DefInjected/InstructionDef/Instructions.xml       |  2 +-
 Core/DefInjected/PawnKindDef/Races_Mechanoid.xml       |  8 ++++----
 .../DefInjected/QuestScriptDef/Script_TradeRequest.xml |  2 +-
 .../ResearchProjects_4_MultiAnalyzer.xml               |  2 +-
 Core/DefInjected/ThingDef/Apparel_Various.xml          |  2 +-
 Core/DefInjected/ThingDef/ImpliedDefs.xml              |  8 ++++----
 Core/DefInjected/ThingDef/Races_Mechanoid.xml          |  2 +-
 Core/Keyed/Menus_Main.xml                              |  6 +++---
 Core/Strings/Words/Nouns/Animals.txt                   | 10 ++++++----
 Core/Strings/Words/Nouns/Mechanoid.txt                 |  4 ++--
 .../ResearchProjectDef/ResearchProjects_Apparel.xml    |  2 +-
 .../DefInjected/RoyalTitleDef/RoyalTitles_Empire.xml   |  2 +-
 Royalty/Keyed/Dialogs_Various.xml                      |  2 +-
 Royalty/Keyed/ITabs.xml                                | 10 +++++-----
 16 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/Core/Backstories/Backstories.xml b/Core/Backstories/Backstories.xml
index f4f5da72..9979a8e4 100644
--- a/Core/Backstories/Backstories.xml
+++ b/Core/Backstories/Backstories.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <BackstoryTranslations>
   
   <AbandonedChild23>
diff --git a/Core/DefInjected/BodyDef/Bodies_Mechanoid.xml b/Core/DefInjected/BodyDef/Bodies_Mechanoid.xml
index 12112430..5dbce77c 100644
--- a/Core/DefInjected/BodyDef/Bodies_Mechanoid.xml
+++ b/Core/DefInjected/BodyDef/Bodies_Mechanoid.xml
@@ -2,7 +2,7 @@
 <LanguageData>
   
   <!-- EN: lancer -->
-  <Lancer.label>飞枪机械螳螂</Lancer.label>
+  <Lancer.label>机械静螳</Lancer.label>
   <!-- EN: left sight sensor -->
   <Lancer.corePart.parts.MechanicalNeck.parts.MechanicalHead.parts.left_sight_sensor.customLabel>左视觉传感器</Lancer.corePart.parts.MechanicalNeck.parts.MechanicalHead.parts.left_sight_sensor.customLabel>
   <!-- EN: right sight sensor -->
@@ -87,7 +87,7 @@
   <Pikeman.corePart.parts.rear_right_leg.parts.rear_right_foot.customLabel>右后足</Pikeman.corePart.parts.rear_right_leg.parts.rear_right_foot.customLabel>
   
   <!-- EN: scyther -->
-  <Scyther.label>镰刀机械螳螂</Scyther.label>
+  <Scyther.label>机械飞螳</Scyther.label>
   <!-- EN: left sight sensor -->
   <Scyther.corePart.parts.MechanicalNeck.parts.MechanicalHead.parts.left_sight_sensor.customLabel>左视觉传感器</Scyther.corePart.parts.MechanicalNeck.parts.MechanicalHead.parts.left_sight_sensor.customLabel>
   <!-- EN: right sight sensor -->
diff --git a/Core/DefInjected/InstructionDef/Instructions.xml b/Core/DefInjected/InstructionDef/Instructions.xml
index 4c7dcf65..ec2b9fdd 100644
--- a/Core/DefInjected/InstructionDef/Instructions.xml
+++ b/Core/DefInjected/InstructionDef/Instructions.xml
@@ -9,7 +9,7 @@
   <!-- EN: Please add a bill to cook simple meals at your cook stove. -->
   <AddBillSimpleMeal.rejectInputMessage>请在炉子上下达烹饪清单。</AddBillSimpleMeal.rejectInputMessage>
   <!-- EN: Colonists need to be told what to cook.\n\nCooking orders are added on the stove itself. Once a bill has been created, colonists will do the work automatically.\n\n1. Wait for the stove to be built.\n2. Click the stove to select it.\n3. Open the BILLS tab.\n4. Click ADD BILL.\n5. Select COOK SIMPLE MEAL on the context menu.\n6. Click the + button to increase the count to 10.\n\nRemember, you can speed up time if building is taking too long.\n\nYou can also select a colonist and right-click the stove to prioritize building it. -->
-  <AddBillSimpleMeal.text>现在你可以安排殖民者来做饭了。\n\n对炉子下达特定的烹饪清单后，殖民者们就会开始做饭。\n\n1. 等待炉子建好\n2. 在菜单中选择「烹饪简单食物」\n3. 将订单数量调整至「10」\n\n记住，你可以随时加速时间流逝速度。你还可以选中殖民者并右击炉灶以优先进行烹饪。</AddBillSimpleMeal.text>
+  <AddBillSimpleMeal.text>现在你可以安排殖民者来做饭了。\n\n对炉子下达特定的烹饪清单后，殖民者们就会开始做饭。\n\n1. 等待炉子建好\n2. 在菜单中选择「烹饪简单食物」\n3. 将清单数量调整至「10」\n\n记住，你可以随时加速时间流逝速度。你还可以选中殖民者并右击炉灶以优先进行烹饪。</AddBillSimpleMeal.text>
   
   <!-- EN: Build an animal sleeping spot\ninside the room -->
   <BuildAnimalSleepingSpot.onMapInstruction>请给你的宠物在室内指定一个动物睡眠点</BuildAnimalSleepingSpot.onMapInstruction>
diff --git a/Core/DefInjected/PawnKindDef/Races_Mechanoid.xml b/Core/DefInjected/PawnKindDef/Races_Mechanoid.xml
index b8aab82f..b6704e4b 100644
--- a/Core/DefInjected/PawnKindDef/Races_Mechanoid.xml
+++ b/Core/DefInjected/PawnKindDef/Races_Mechanoid.xml
@@ -6,8 +6,8 @@
   <Mech_Centipede.labelPlural>机械蜈蚣</Mech_Centipede.labelPlural>
   
   <!-- EN: lancer -->
-  <Mech_Lancer.label>飞枪机械螳螂</Mech_Lancer.label>
-  <Mech_Lancer.labelPlural>飞枪机械螳螂</Mech_Lancer.labelPlural>
+  <Mech_Lancer.label>机械静螳</Mech_Lancer.label>
+  <Mech_Lancer.labelPlural>机械静螳</Mech_Lancer.labelPlural>
   
   <!-- EN: pikeman -->
   <Mech_Pikeman.label>机械蝎蝽</Mech_Pikeman.label>
@@ -15,7 +15,7 @@
   <Mech_Pikeman.labelPlural>机械蝎蝽</Mech_Pikeman.labelPlural>
   
   <!-- EN: scyther -->
-  <Mech_Scyther.label>镰刀机械螳螂</Mech_Scyther.label>
-  <Mech_Scyther.labelPlural>镰刀机械螳螂</Mech_Scyther.labelPlural>
+  <Mech_Scyther.label>机械飞螳</Mech_Scyther.label>
+  <Mech_Scyther.labelPlural>机械飞螳</Mech_Scyther.labelPlural>
   
 </LanguageData>
\ No newline at end of file
diff --git a/Core/DefInjected/QuestScriptDef/Script_TradeRequest.xml b/Core/DefInjected/QuestScriptDef/Script_TradeRequest.xml
index ee34ab62..e4c7b84e 100644
--- a/Core/DefInjected/QuestScriptDef/Script_TradeRequest.xml
+++ b/Core/DefInjected/QuestScriptDef/Script_TradeRequest.xml
@@ -7,7 +7,7 @@
     <li>qualityInfo-></li>
   -->
   <TradeRequest.questDescriptionRules.rulesStrings>
-    <li>questDescription->附近一个名叫[settlement_label]的聚落向我们发出了一场交易请求。 他们想采购以下物资：\n\n  [requestedThingCount]x [requestedThing_label]([qualityInfo])(价值： [requestedThingMarketValue_money])\n\n作为回报，[allRewardsDescriptions]\n\n如果你同意这场交易，请派出一支携带相应物资的远行队前往目标地点。 旅途预估时间约为：[estimatedTravelTime_duration]。</li>
+    <li>questDescription->附近一个名叫[settlement_label]的聚落向我们发出了一场交易请求。 他们想采购以下物资：\n\n  [requestedThingCount]x [qualityInfo] [requestedThing_label](价值： [requestedThingMarketValue_money])\n\n作为回报，[allRewardsDescriptions]\n\n如果你同意这场交易，请派出一支携带相应物资的远行队前往目标地点。 旅途预估时间约为：[estimatedTravelTime_duration]。</li>
     <li>qualityInfo(requestedThingHasQuality==True,priority=1)->一般品质以上</li>
     <li>qualityInfo-></li>
   </TradeRequest.questDescriptionRules.rulesStrings>
diff --git a/Core/DefInjected/ResearchProjectDef/ResearchProjects_4_MultiAnalyzer.xml b/Core/DefInjected/ResearchProjectDef/ResearchProjects_4_MultiAnalyzer.xml
index 0c069648..3277fddb 100644
--- a/Core/DefInjected/ResearchProjectDef/ResearchProjects_4_MultiAnalyzer.xml
+++ b/Core/DefInjected/ResearchProjectDef/ResearchProjects_4_MultiAnalyzer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: advanced fabrication -->
diff --git a/Core/DefInjected/ThingDef/Apparel_Various.xml b/Core/DefInjected/ThingDef/Apparel_Various.xml
index 66a8956b..c5286b4e 100644
--- a/Core/DefInjected/ThingDef/Apparel_Various.xml
+++ b/Core/DefInjected/ThingDef/Apparel_Various.xml
@@ -4,7 +4,7 @@
   <!-- EN: recon armor -->
   <Apparel_ArmorRecon.label>斥候装甲</Apparel_ArmorRecon.label>
   <!-- EN: A suit of light partially-powered armor, designed to permit quick movement. Lightweight plasteel-weave plates block attacks without compromising mobility, and neuro-memetic assistors in the lower body allow a human to wear the armor and still move easily.\n\nArmor like this is often used by imperial scout troops and glitterworld police forces. -->
-  <Apparel_ArmorRecon.description>轻量化的阉割版动力装甲服，但轻量化的设计也使其相较于动力装甲具备更优越的机动性，配置的轻型玻璃钢装甲可以在不影响穿戴者灵活性的情况下提供可靠的防护，位于装甲中段的神经模因装置可以让使用者更容易地穿戴和使用它。\n\n这种装甲服被闪耀世界的警方和侦查部队大量使用。</Apparel_ArmorRecon.description>
+  <Apparel_ArmorRecon.description>轻量化的阉割版动力装甲，但轻量化的设计也使其相较于其他动力装甲具备更优越的机动性，配置的轻型玻璃钢装甲可以在不影响穿戴者灵活性的情况下提供可靠的防护，位于装甲中段的神经模因装置可以让使用者更容易地穿戴和使用它。\n\n这种装甲服被闪耀世界的警方和侦查部队大量使用。</Apparel_ArmorRecon.description>
   
   <!-- EN: T-shirt -->
   <Apparel_BasicShirt.label>T恤衫</Apparel_BasicShirt.label>
diff --git a/Core/DefInjected/ThingDef/ImpliedDefs.xml b/Core/DefInjected/ThingDef/ImpliedDefs.xml
index 04c7c430..5687dbb9 100644
--- a/Core/DefInjected/ThingDef/ImpliedDefs.xml
+++ b/Core/DefInjected/ThingDef/ImpliedDefs.xml
@@ -755,10 +755,10 @@
   <!-- EN: 机械蜈蚣的尸体。 -->
   <Corpse_Mech_Centipede.description>机械蜈蚣尸体</Corpse_Mech_Centipede.description>
   
-  <!-- EN: 机械枪兵尸体 -->
-  <Corpse_Mech_Lancer.label>机械枪兵尸体</Corpse_Mech_Lancer.label>
-  <!-- EN: 机械枪兵的尸体。 -->
-  <Corpse_Mech_Lancer.description>机械枪兵尸体</Corpse_Mech_Lancer.description>
+  <!-- EN: 机械静螳尸体 -->
+  <Corpse_Mech_Lancer.label>机械静螳尸体</Corpse_Mech_Lancer.label>
+  <!-- EN: 机械静螳的尸体。 -->
+  <Corpse_Mech_Lancer.description>机械静螳尸体</Corpse_Mech_Lancer.description>
   
   <!-- EN: 机械飞螳尸体 -->
   <Corpse_Mech_Scyther.label>机械飞螳尸体</Corpse_Mech_Scyther.label>
diff --git a/Core/DefInjected/ThingDef/Races_Mechanoid.xml b/Core/DefInjected/ThingDef/Races_Mechanoid.xml
index d7fd437b..c0e808de 100644
--- a/Core/DefInjected/ThingDef/Races_Mechanoid.xml
+++ b/Core/DefInjected/ThingDef/Races_Mechanoid.xml
@@ -9,7 +9,7 @@
   <Mech_Centipede.tools.head.label>头</Mech_Centipede.tools.head.label>
   
   <!-- EN: lancer -->
-  <Mech_Lancer.label>机械枪兵</Mech_Lancer.label>
+  <Mech_Lancer.label>机械静螳</Mech_Lancer.label>
   <!-- EN: Fast human-sized combat mechanoids built for medium and long-range combat. Their bodies are light, making them vulnerable targets at close range - especially in melee combat. -->
   <Mech_Lancer.description>一种人类大小的战斗机械，其面部有巨大的光学传感器，用于远程瞄准武器。虽然在远距离上很强势，但在近战中较弱。</Mech_Lancer.description>
   <!-- EN: left fist -->
diff --git a/Core/Keyed/Menus_Main.xml b/Core/Keyed/Menus_Main.xml
index 50177277..a1468130 100644
--- a/Core/Keyed/Menus_Main.xml
+++ b/Core/Keyed/Menus_Main.xml
@@ -59,7 +59,7 @@
 
   <!-- Main menu translations info window -->
   <!-- EN: All translations of RimWorld are fan-made. This fan-made translation was created by the following excellent volunteers:\n\n{0} -->
-  <TranslationThanks>RimWorld的所有翻译均由本游戏的爱好者们制作。翻译成员如下：\n\n{0}</TranslationThanks>
+  <TranslationThanks>RimWorld的所有翻译均由本游戏的爱好者们制作。\n翻译成员如下：\n\n{0}</TranslationThanks>
   <!-- EN: You can contribute too. Click below to learn more (opens web browser). -->
   <TranslationHowToContribute>你也可以为本游戏翻译做贡献。单击下方按钮以了解更多信息（打开Web浏览器）</TranslationHowToContribute>
   <!-- EN: Learn more -->
@@ -193,13 +193,13 @@
   <!-- EN: This mod is incompatible with: {0}. -->
   <ModIncompatibleWithTip>与这个MOD不兼容的有: {0}。</ModIncompatibleWithTip>
   <!-- EN: This mod is loading in the wrong order relative to another mod. Use the 'auto-sort' button, or re-order the mods manually. -->
-  <ModOrderingWarning>相对于另一个mod，此mod加载顺序错误。使用「自动排序」按钮，或手动重新排列MOD组模。</ModOrderingWarning>
+  <ModOrderingWarning>相对于另一个mod，此mod加载顺序错误。使用「自动排序」按钮，或手动重新排列MOD。</ModOrderingWarning>
   <!-- EN: Another active mod uses the same ID: {0}. -->
   <ModWithSameIdAlreadyActive>另一个激活的mod使用了相同的ID: {0}。</ModWithSameIdAlreadyActive>
   <!-- EN: There is a cyclic mod dependency starting with {0}. -->
   <ModCyclicDependency>与{0}产生了循环依赖。</ModCyclicDependency>
   <!-- EN: This requires following mods to work: {0}. -->
-  <ModUnsatisfiedDependency>这需要以下MOD组模才能运行: {0}。</ModUnsatisfiedDependency>
+  <ModUnsatisfiedDependency>这需要以下MOD才能运行: {0}。</ModUnsatisfiedDependency>
   <!-- EN: This mod was not made for this version of RimWorld, and will probably not work correctly. -->
   <ModNotMadeForThisVersion>该 Mod 并不适配于当前 RimWorld 版本，很可能无法正常运行。</ModNotMadeForThisVersion>
   <!-- EN: This mod was made for a newer version of RimWorld than this, and will probably not work correctly. -->
diff --git a/Core/Strings/Words/Nouns/Animals.txt b/Core/Strings/Words/Nouns/Animals.txt
index fa2da3b8..2d5420be 100644
--- a/Core/Strings/Words/Nouns/Animals.txt
+++ b/Core/Strings/Words/Nouns/Animals.txt
@@ -1,4 +1,4 @@
-野牦牛
+雪牛
 爆炸鼠
 巨懒
 眼镜蛇
@@ -6,8 +6,6 @@
 野猪
 松鼠
 鬣蜥
-
-
 土豚
 短吻鳄
 羊驼
@@ -185,4 +183,8 @@
 蠕虫
 牦牛
 斑马
-雪牛
\ No newline at end of file
+野牛
+豚鼠
+野山羊
+绵羊
+穿山甲
diff --git a/Core/Strings/Words/Nouns/Mechanoid.txt b/Core/Strings/Words/Nouns/Mechanoid.txt
index 8923e56a..719c9111 100644
--- a/Core/Strings/Words/Nouns/Mechanoid.txt
+++ b/Core/Strings/Words/Nouns/Mechanoid.txt
@@ -1,8 +1,8 @@
 
 机械飞螳
-机械枪兵
+机械静螳
 机械蜈蚣
-
+机械蝎蝽
 机器生物
 机器人
 机器人
diff --git a/Royalty/DefInjected/ResearchProjectDef/ResearchProjects_Apparel.xml b/Royalty/DefInjected/ResearchProjectDef/ResearchProjects_Apparel.xml
index 345d1855..c0a457d9 100644
--- a/Royalty/DefInjected/ResearchProjectDef/ResearchProjects_Apparel.xml
+++ b/Royalty/DefInjected/ResearchProjectDef/ResearchProjects_Apparel.xml
@@ -3,7 +3,7 @@
   
   <!-- EN: noble apparel -->
   <NobleApparel.label>贵族服饰</NobleApparel.label>
-  <!-- EN: Tailor noble-specific apparel like ruffle shirts and bloom pants. -->
+  <!-- EN: Tailor noble-specific apparel like ruffle shirts and royal robes. -->
   <NobleApparel.description>允许制作贵族服饰，例如褶边礼服衬衫和灯笼裤。</NobleApparel.description>
   
   <!-- EN: royal apparel -->
diff --git a/Royalty/DefInjected/RoyalTitleDef/RoyalTitles_Empire.xml b/Royalty/DefInjected/RoyalTitleDef/RoyalTitles_Empire.xml
index 21b38555..4e134c96 100644
--- a/Royalty/DefInjected/RoyalTitleDef/RoyalTitles_Empire.xml
+++ b/Royalty/DefInjected/RoyalTitleDef/RoyalTitles_Empire.xml
@@ -58,7 +58,7 @@
   
   <!-- EN: stellarch -->
   <Stellarch.label>星系主宰</Stellarch.label>
-  <!-- EN: The Imperial title of stellarch represents dominion over an entire star system.\n\nIn the Empire, since interstellar travel times are years long, stellarchs rule their systems with a great degree of independence. The each swear fealty to the Emperor, but since the Emperor may be many light-years away, a stellarch may go years or decades without interacting with him. -->
+  <!-- EN: The Imperial title of stellarch represents dominion over an entire star system.\n\nIn the Empire, since interstellar travel times are years long, stellarchs rule their systems with a great degree of independence. They each swear fealty to the Emperor, but since the Emperor may be many light-years away, a stellarch may go years or decades without interacting with him. -->
   <Stellarch.description>星系主宰的头衔代表着对整个星系的统治权。\n\n在帝国中，由于星际旅行时间长达数年，星系主宰以极大的独立性统治着他们的星系。他们都宣誓效忠于皇帝，但由于皇帝可能在许多光年之外，一位星系主宰可能在数年或数十年之间都不会与他皇帝互动。</Stellarch.description>
   
   <!-- EN: yeoman -->
diff --git a/Royalty/Keyed/Dialogs_Various.xml b/Royalty/Keyed/Dialogs_Various.xml
index c2eecc18..2610d9f1 100644
--- a/Royalty/Keyed/Dialogs_Various.xml
+++ b/Royalty/Keyed/Dialogs_Various.xml
@@ -31,7 +31,7 @@
   <!-- EN: Any powered armor -->
   <ApparelRequirementAnyPowerArmor>任意动力装甲</ApparelRequirementAnyPowerArmor>
   <!-- EN: Any psycaster apparel -->
-  <ApparelRequirementAnyPsycasterApparel>任意能力者</ApparelRequirementAnyPsycasterApparel>
+  <ApparelRequirementAnyPsycasterApparel>任意心灵服装</ApparelRequirementAnyPsycasterApparel>
   <!-- EN: Disabled work types -->
   <DisabledWorkTypes>禁用的工作类型</DisabledWorkTypes>
   <!-- EN: Allowed foods -->
diff --git a/Royalty/Keyed/ITabs.xml b/Royalty/Keyed/ITabs.xml
index af3560dc..f3c07767 100644
--- a/Royalty/Keyed/ITabs.xml
+++ b/Royalty/Keyed/ITabs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Character tab -->
@@ -10,10 +10,10 @@
   <RoyalTitleTooltipNextTitleFavorCost>支付{0}{FACTION_royalFavorLabel}</RoyalTitleTooltipNextTitleFavorCost>
   <!-- EN: No more earnable titles on this planet. -->
   <RoyalTitleTooltipFinalTitle>这个星球上不再有可获得的头衔。</RoyalTitleTooltipFinalTitle>
-  <!-- EN: If {PAWN_nameFull} dies, {HEIR_nameFull} is designated to inherit {PAWN_possessive} title. -->
-  <RoyalTitleTooltipInheritance>如果{PAWN_nameFull}死亡，则指定{HEIR_nameFull}继承{PAWN_possessive}头衔。</RoyalTitleTooltipInheritance>
-  <!-- EN: If {PAWN_nameFull} dies, no one is designated to inherit {PAWN_possessive} title. The title will be lost. -->
-  <RoyalTitleTooltipNoHeir>如果{PAWN_nameFull}死去时，没有人被指定继承{PAWN_possessive}头衔。这些头衔将失传。</RoyalTitleTooltipNoHeir>
+  <!-- EN: If {PAWN_nameDef} dies, {HEIR_nameFull} is designated to inherit {PAWN_possessive} title. -->
+  <RoyalTitleTooltipInheritance>如果{PAWN_nameDef}死亡，则指定{HEIR_nameFull}继承{PAWN_possessive}头衔。</RoyalTitleTooltipInheritance>
+  <!-- EN: No one is designated to inherit {PAWN_nameDef}'s title. If {PAWN_pronoun} dies, the title will be lost. -->
+  <RoyalTitleTooltipNoHeir>如果{PAWN_pronoun}死去时，没有人被指定继承{PAWN_nameDef}的头衔。这些头衔将失传。</RoyalTitleTooltipNoHeir>
   <!-- EN: Earnable titles of {FACTION_name} -->
   <RoyalTitleTooltipTitlesEarnable>{FACTION_name}的可获取头衔</RoyalTitleTooltipTitlesEarnable>
   <!-- EN: Other titles of {FACTION_name} -->