Update to 0.17.1515 rev865 (development build) (request translation)

DefInjected/BiomeDef/Biomes_Moderate.xml

@@ -6,6 +6,9 @@
   <Ocean.label>海洋</Ocean.label>
   <Ocean.description>这里是一片汪洋，鱼儿会很喜欢这里的，你可就不一定了。</Ocean.description>
 
+  <Lake.label>lake</Lake.label>
+  <Lake.description>A large lake. Beautiful to live next to. Not so beautiful to live in.</Lake.description>
+
 
   <!-- Buildable biomes -->
 
@@ -13,7 +16,7 @@
   <TemperateForest.description>散布着肥沃的土壤落叶乔木林。丛林里和平原上游荡着多种多样的动物群落。冬季的积雪会导致出行变得缓慢。</TemperateForest.description>
 
   <TropicalRainforest.label>热带雨林</TropicalRainforest.label>
-  <TropicalRainforest.description>茂密潮湿的丛林。茂密的植被和凶猛的野生动物使得建造和生存变得困难。在这里，疾病是一种持续威胁。</TropicalRainforest.description>
+  <TropicalRainforest.description>茂密潮湿的丛林。尽管如此美丽多姿，却实际上是个非常危险的生态系统。繁茂到闭塞的植被，富有攻击性的动物，以及阴魂不散的疾病，这就是为什么有些探险者将之称为「绿色地狱」。</TropicalRainforest.description>
 
 
 </LanguageData>

DefInjected/BodyPartDef/BodyParts_Humanoid.xml

@@ -18,7 +18,7 @@
   <RightHandMiddleFinger.label>右中指</RightHandMiddleFinger.label>
   <RightHandIndexFinger.label>右食指</RightHandIndexFinger.label>
   <RightHandThumb.label>右拇指</RightHandThumb.label>
-  <Waist.label>waist</Waist.label>
+  <Waist.label>腰</Waist.label>
   <LeftFootLittleToe.label>左小趾</LeftFootLittleToe.label>
   <LeftFootFourthToe.label>左次小趾</LeftFootFourthToe.label>
   <LeftFootMiddleToe.label>左三趾</LeftFootMiddleToe.label>

DefInjected/BodyPartGroupDef/BodyPartGroups.xml

@@ -6,8 +6,8 @@
   <FullHead.label>头部</FullHead.label>
   <Eyes.label>眼睛</Eyes.label>
   <Teeth.label>牙齿</Teeth.label>
-  <Mouth.label>嘴巴</Mouth.label>
-  <Neck.label>neck</Neck.label>
+  <Mouth.label>嘴</Mouth.label>
+  <Neck.label>颈部</Neck.label>
   <Arms.label>手臂</Arms.label>
   <Shoulders.label>肩部</Shoulders.label>
   <Hands.label>双手</Hands.label>

DefInjected/ChemicalDef/Ambrosia.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <!-- Ambrosia addiction -->
+
+  <Ambrosia.label>ambrosia</Ambrosia.label>
+
+
+</LanguageData>

DefInjected/ConceptDef/Concepts_Entry.xml

@@ -4,7 +4,7 @@
   <!-- Concepts taught in the entry screens -->
 
   <WorldCameraMovement.label>地图镜头移动</WorldCameraMovement.label>
-  <WorldCameraMovement.helpText>使用鼠标滚轮，或使用{Key:MapZoomIn}和{Key:MapZoomOut}键缩放。\n\n使用{Key:MapDollyUp}-{Key:MapDollyLeft}-{Key:MapDollyDown}-{Key:MapDollyRight}键平移，或者按住鼠标中键（滚轮）拖拽。</WorldCameraMovement.helpText>
+  <WorldCameraMovement.helpText>使用「鼠标滚轮」，或使用{Key:MapZoomIn}和{Key:MapZoomOut}键缩放。\n\n使用{Key:MapDollyUp}-{Key:MapDollyLeft}-{Key:MapDollyDown}-{Key:MapDollyRight}键平移，或者按住「鼠标中键（滚轮）」并「拖拽」。</WorldCameraMovement.helpText>
 
 
 </LanguageData>

DefInjected/ConceptDef/Concepts_NotedOpportunistic.xml

@@ -4,16 +4,16 @@
   <!-- Concepts taught through the learning readout, when opportunities arise -->
 
   <ReformCaravan.label>重组远行队</ReformCaravan.label>
-  <ReformCaravan.helpText>你可以在「世界」视图中对相遇的远行队进行重组。</ReformCaravan.helpText>
+  <ReformCaravan.helpText>你可以在「世界」视图中通过「重组远行队」命令对相遇的远行队进行重组。</ReformCaravan.helpText>
 
   <Rescuing.label>救援</Rescuing.label>
   <Rescuing.helpText>要对一名殖民者实施救援，请选择一名健康的殖民者并对受伤的角色点击鼠标右键。\n\n如果你救援了非本殖民地的外人，他在伤愈之后并不会加入你，而是会选择离开。如果你想招募他，必须先将其俘虏并囚禁。</Rescuing.helpText>
 
   <Capturing.label>俘虏</Capturing.label>
-  <Capturing.helpText>一名敌人无法行动了，你可以俘虏他们！\n若想俘虏敌人，先选择一名殖民者，然后对不能行动的敌人点击鼠标右键，并选择「俘虏」。\n\n你需要有额外专门设立给囚犯的床位。</Capturing.helpText>
+  <Capturing.helpText>一名敌人无法行动了，你可以「俘虏」他们！\n若想俘虏敌人，先选择一名殖民者，然后对不能行动的敌人点击鼠标右键，并选择「俘虏」。\n\n你需要有额外专门设立给囚犯的床位。</Capturing.helpText>
 
-  <ShieldBelts.label>Shield belts</ShieldBelts.label>
-  <ShieldBelts.helpText>Shield belts stop ranged attacks from coming in or out. They have no effect on melee attacks.\n\nTo fight against shield belts, either concentrate a lot of gunfire on the target, or fight hand-to-hand.</ShieldBelts.helpText>
+  <ShieldBelts.label>护盾腰带</ShieldBelts.label>
+  <ShieldBelts.helpText>护盾腰带能够阻止远程伤害，但是对近战攻击不起效果。\n\n面对装备有护盾腰带的敌人时，可以选择用火力压制或是肉搏。</ShieldBelts.helpText>
 
   <InteractingWithTraders.label>与商人互动</InteractingWithTraders.label>
   <InteractingWithTraders.helpText>你可以和头上有「？」的人物说话。\n\n选择一位殖民者，然后再对头上有「？」的角色点击鼠标右键。</InteractingWithTraders.helpText>
@@ -22,7 +22,7 @@
   <Drafting.helpText>若想直接控制殖民者进行战斗，选择他们并按下「征召」按钮。\n\n被征召的殖民者只会做你命令他们去做的战斗相关的指令，装备有武器的殖民者会自动使用武器。\n\n不要一直保持征召状态，殖民者会挨饿从而变得不开心。</Drafting.helpText>
 
   <BuildOrbitalTradeBeacon.label>建造轨道交易信标</BuildOrbitalTradeBeacon.label>
-  <BuildOrbitalTradeBeacon.helpText>若想发送物品或白银给轨道贸易商，你必须建立一个轨道交易信标然后其旁边设立一个储存区。</BuildOrbitalTradeBeacon.helpText>
+  <BuildOrbitalTradeBeacon.helpText>若想发送物品或白银给轨道贸易商，你必须建立一个「轨道交易信标」然后其旁边设立一个储存区。</BuildOrbitalTradeBeacon.helpText>
 
   <AnimalsDontAttackDoors.label>猎杀人类的动物</AnimalsDontAttackDoors.label>
   <AnimalsDontAttackDoors.helpText>猎杀人类的动物通常不会攻击门或者未启用的炮塔，你可以通过躲进屋内来躲避它们。但是它们会等你出来。</AnimalsDontAttackDoors.helpText>
@@ -51,6 +51,9 @@
   <DrugBurning.label>销毁成瘾品</DrugBurning.label>
   <DrugBurning.helpText>成瘾品很有用，但也会导致成瘾。\n\n如果你想在殖民地内完全禁用成瘾品，你可以选择在篝火处烧毁成瘾品。</DrugBurning.helpText>
 
+  <DoorOpenSpeed.label>Door opening speeds</DoorOpenSpeed.label>
+  <DoorOpenSpeed.helpText>Doors open at different speeds depending on what they're made of.\n\nWarning: Stone doors open very slowly. Anyone passing through will be significantly slowed down.</DoorOpenSpeed.helpText>
+
 
   <!--<PersonalShields.label>个人护盾</PersonalShields.label>-->
   <!--<PersonalShields.helpText>个人护盾能够阻止远程伤害，但是对近战攻击不起效果。\n\n面对装备有单人护盾的敌人时，可以选择用火力压制或是肉搏。</PersonalShields.helpText>-->

DefInjected/ConceptDef/Concepts_NotedSelfshow.xml

@@ -4,10 +4,10 @@
   <!-- Concepts taught through the learning readout, with no opportunity needed -->
 
   <CameraDolly.label>镜头移动</CameraDolly.label>
-  <CameraDolly.helpText>按住鼠标中键并拖拽或者使用{Key:MapDollyUp}-{Key:MapDollyLeft}-{Key:MapDollyDown}-{Key:MapDollyRight}按键来移动镜头。</CameraDolly.helpText>
+  <CameraDolly.helpText>按住「鼠标中键或右键」并拖拽或者使用{Key:MapDollyUp}-{Key:MapDollyLeft}-{Key:MapDollyDown}-{Key:MapDollyRight}按键来移动镜头。</CameraDolly.helpText>
 
   <CameraZoom.label>镜头缩放</CameraZoom.label>
-  <CameraZoom.helpText>通过鼠标滚轮或者{Key:MapZoomIn}和{Key:MapZoomOut}来缩放镜头。</CameraZoom.helpText>
+  <CameraZoom.helpText>通过「鼠标滚轮」或者{Key:MapZoomIn}和{Key:MapZoomOut}来缩放镜头。</CameraZoom.helpText>
 
   <TimeControls.label>时间控制</TimeControls.label>
   <TimeControls.helpText>你可以加速时间流逝。\n\n尝试通过{Key:TimeSpeedNormal}，{Key:TimeSpeedFast}和{Key:TimeSpeedSuperfast}按键来控制时间，或是点击屏幕右下方的按钮。</TimeControls.helpText>
@@ -19,10 +19,10 @@
   <Stockpiles.helpText>你的殖民者们需要一块地方来储存物品，规划一片「储存区」来存放物资吧。\n\n你可以在「建筑规划」的面板中找到「区域」——「储存区」来设置。</Stockpiles.helpText>
 
   <Forbidding.label>禁用和解禁</Forbidding.label>
-  <Forbidding.helpText>殖民者不能对被标记为「禁用」的物品进行操作。\n\n禁用的物品上会有一个红色的小X，选择禁用物品后，在下方的控制栏内可以解禁物品。</Forbidding.helpText>
+  <Forbidding.helpText>殖民者不能对被标记为「禁用」的物品进行操作。\n\n禁用的物品上会有一个红色的小X，选择禁用物品后，在下方的控制栏内可以「解禁」物品。</Forbidding.helpText>
 
   <GrowingFood.label>种植区</GrowingFood.label>
-  <GrowingFood.helpText>要种植作物，在「建筑规划」菜单下的「区域」选项里可找到种植区。\n\n种植区只能被设立在肥沃的土地上。</GrowingFood.helpText>
+  <GrowingFood.helpText>要种植作物，在「建筑规划」菜单下的「区域」选项里可找到「种植区」。\n\n种植区只能被设立在肥沃的土地上。</GrowingFood.helpText>
 
   <EquippingWeapons.label>装备武器</EquippingWeapons.label>
   <EquippingWeapons.helpText>你的殖民者在抵达时也带来了武器，装备起来！\n\n选择每一个殖民者并在希望装备的武器上点击右键。</EquippingWeapons.helpText>
@@ -31,7 +31,7 @@
   <Alerts.helpText>屏幕右侧边缘的警报按钮会告诉你需要注意的事情。\n\n记得要留神。</Alerts.helpText>
 
   <Mining.label>采矿</Mining.label>
-  <Mining.helpText>你可以通过「建筑规划」面板中「命令」选项里安排在何处开采岩石。\n\n你可能会开采到钢铁、黄金、塑钢或者其他有用的原料。</Mining.helpText>
+  <Mining.helpText>你可以通过「建筑规划」面板中「命令」选项里安排在何处开采岩石。\n\n你可能会开采到「钢铁」、「黄金」、「玻璃钢」或者其他有用的原料。</Mining.helpText>
 
   <WorkTab.label>工作标签页</WorkTab.label>
   <WorkTab.helpText>你可以在屏幕左下角的「工作」标签页中来分配各殖民者的工作优先级。\n\n他们总是会先进行优先级更高的任务。\n\n如果某项工作没有任何人被安排从事，或是总有优先级更高的事情需要处理，那么这些工作将永远不会被完成。</WorkTab.helpText>
@@ -43,22 +43,22 @@
   <CoverAndShooting.helpText>远程作战第一课：先给自己找掩体。\n\n掩体只有在处于交火路径当中且你的殖民者紧贴着掩体时才生效。\n\n你也可以把殖民者放在墙角后来射击。他们会侧身射击。\n\n大部分物体都可以作为掩体，但是它们的效果并不尽相同，一棵树比没有掩体要强，但是远不如沙袋好使。</CoverAndShooting.helpText>
 
   <FormCaravan.label>组建远行队</FormCaravan.label>
-  <FormCaravan.helpText>你可以组建远行队以派遣一队人员穿过这颗行星。\n\n在「世界」标签中，选中你的基地并点击「组织远行队」按钮。</FormCaravan.helpText>
+  <FormCaravan.helpText>你可以组建远行队以派遣一队人员穿过这颗行星。\n\n在「世界」标签中，选中你的基地并点击「组建远行队」按钮。</FormCaravan.helpText>
 
   <AnimalTaming.label>动物驯服</AnimalTaming.label>
-  <AnimalTaming.helpText>你可以委派殖民者驯服野生动物。\n\n殖民者会为动物提供食物，然后尝试驯服它们。\n\n当心：有些动物在被驯服时会变得暴躁，攻击你的殖民者。</AnimalTaming.helpText>
+  <AnimalTaming.helpText>你可以通过「驯服」命令指派殖民者驯服野生动物。\n\n殖民者会为动物提供食物，然后尝试驯服它们。\n\n当心：有些动物在被驯服时会变得暴躁，攻击你的殖民者。</AnimalTaming.helpText>
 
   <AnimalTraining.label>动物训练</AnimalTraining.label>
-  <AnimalTraining.helpText>你可以指派一个已驯服的动物进一步接受特定指令的训练。\n\n动物无法一直受训，它们需要时间来休息。</AnimalTraining.helpText>
+  <AnimalTraining.helpText>在已驯服的动物的「训练」标签中，你可以指派动物进一步接受特定技能的训练。\n\n动物无法连续受训，训练阶段之间需要间隔一段时间。</AnimalTraining.helpText>
 
   <InfoCard.label>详细信息卡</InfoCard.label>
   <InfoCard.helpText>任何物品、建筑和角色都可以通过信息卡来查看详细的数据。\n\n通过点击「i」来打开信息卡进入详细信息面板。</InfoCard.helpText>
 
   <StorageTab.label>储存筛选</StorageTab.label>
-  <StorageTab.helpText>你可以通过点击储存区或者仓库面板左下角的「储存筛选」按钮来进行详细设置。\n\n你可以扩大/减少该储存区允许堆放的物品种类。\n\n也可以更改当前区域的优先级，殖民者总是会优先向优先级更高的储存区和仓库搬运东西。</StorageTab.helpText>
+  <StorageTab.helpText>你可以通过点击储存区或者仓库面板左下角的「储存筛选」按钮来进行详细设置。\n\n你可以扩大/减少该储存区允许堆放的物品种类。\n\n也可以更改当前区域的「优先级」，殖民者总是会优先向优先级更高的储存区和仓库搬运东西。</StorageTab.helpText>
 
   <HomeArea.label>了解居住区</HomeArea.label>
-  <HomeArea.helpText>居住区是你的殖民者会打扫以及灭火的区域。\n\n在「建筑规划」面板中的「区域」选项里可以设立居住区。</HomeArea.helpText>
+  <HomeArea.helpText>「居住区」是你的殖民者会清洁以及灭火的区域。\n\n在「建筑规划」面板中的「区域」选项里可以设立「居住区」。</HomeArea.helpText>
 
   <SpoilageAndFreezers.label>腐烂和冷藏</SpoilageAndFreezers.label>
   <SpoilageAndFreezers.helpText>大部分的食物在短时期后就会过期腐烂。\n\n你可以将一间房间做成冷藏室来避免这种情况发生。\n\n在一个房间中安装一到两台制冷机，再将目标温度设置为零下即可。\n\n被冷冻的食物不会腐烂。</SpoilageAndFreezers.helpText>
@@ -67,25 +67,25 @@
   <Deterioration.helpText>放置在室外的物品会因为淋雨而缓慢损坏。\n\n如果你想长期保留该物品，就把它们挪到屋顶之下。</Deterioration.helpText>
 
   <HostilityResponse.label>应敌模式</HostilityResponse.label>
-  <HostilityResponse.helpText>你可以在「方案」标签页中配置你的殖民者在面临危险时如何应对。\n\n他们会遵照你的安排选择无视、逃跑还是迎战。</HostilityResponse.helpText>
+  <HostilityResponse.helpText>你可以在设置你的殖民者在面临危险时如何自动应对。\n\n在「方案」标签中选择「逃跑」、「反击」或「无视」模式。</HostilityResponse.helpText>
 
   <AllowedAreas.label>允许活动区域</AllowedAreas.label>
-  <AllowedAreas.helpText>殖民者和动物可以通过在「管制」标签页中设置「活动区域」来限定活动范围。他们不会在活动区外的地区从事任何活动和工作。\n\n你可以设置多个区域然后给不同的殖民者/动物设置不同的限制方案。\n\n添加、缩减范围区域需要在「建筑规划」菜单中的「区域」菜单栏进行。分配区域需要在「管制」面板中进行。</AllowedAreas.helpText>
+  <AllowedAreas.helpText>殖民者和动物可以通过在「管制」标签页中设置「允许活动区域」来限定活动范围。他们不会在活动区外的地区从事任何活动和工作。\n\n你可以设置多个区域然后给不同的殖民者/动物设置不同的限制方案。\n\n「添加允许活动区」或「移除允许活动区」需要在「建筑规划」菜单中的「区域」菜单栏进行。分配区域需要在「管制」面板中进行。</AllowedAreas.helpText>
 
   <MedicalOperations.label>医疗手术</MedicalOperations.label>
-  <MedicalOperations.helpText>要进行一次手术，例如器官摘取或者安装假肢，可以打开殖民者的「健康」面板，然后选择「手术」选项卡。</MedicalOperations.helpText>
+  <MedicalOperations.helpText>要进行一次手术，例如器官摘取或者安装假肢，可以打开殖民者的「健康」标签，然后切换至「手术」子标签。</MedicalOperations.helpText>
 
   <TimeAssignments.label>作息表</TimeAssignments.label>
   <TimeAssignments.helpText>你可以在「管制」标签页中调整殖民者每日的活动安排。</TimeAssignments.helpText>
 
   <ManualWorkPriorities.label>手动分配工作优先级</ManualWorkPriorities.label>
-  <ManualWorkPriorities.helpText>Rimworld最核心的就是合理配置你的殖民者各项工作的设置。\n\n开启手动管理工作优先级模式后，你可以为每一个人的每一项工作设置具体的优先度。\n\n标记1为最高优先级，4为最低，如果没有数字则表示不会从事此项工作。\n\n殖民者总是会先进行优先度更高的工作，同样优先度等级的工作会优先处理靠左边的任务。</ManualWorkPriorities.helpText>
+  <ManualWorkPriorities.helpText>Rimworld最核心的就是合理配置你的殖民者各项工作的设置。\n\n在「工作」标签中开启「手动分配工作优先级」模式后，你可以为每一个人的每一项工作设置具体的优先度。\n\n通过鼠标左右键修改优先级数字，标记1为最高优先级，4为最低，如果没有数字则表示不会从事此项工作。\n\n殖民者总是会先进行优先度更高的工作，同样优先度等级的工作会优先处理靠左边的任务。</ManualWorkPriorities.helpText>
 
   <GettingMoreTraders.label>获得更多商队</GettingMoreTraders.label>
   <GettingMoreTraders.helpText>你的盟友越多，贸易商队就越多。\n\n如果你没有盟友，就不会有任何商队前来拜访！\n\n你还可以通过通讯台来呼叫盟友派遣商队，这样的话你需要支付一笔费用。</GettingMoreTraders.helpText>
 
   <InspectRoomStats.label>房间状态查看</InspectRoomStats.label>
-  <InspectRoomStats.helpText>你可以通过点选屏幕右下角的「开关房间数据显示」按钮来展示房间的各种详细属性，例如财富、美观、整洁和感观等等。</InspectRoomStats.helpText>
+  <InspectRoomStats.helpText>你可以通过点选屏幕右下角的「开关房间数据显示」开关按钮来展示房间的各种详细属性，例如财富、美观、整洁和感观等等。</InspectRoomStats.helpText>
 
   <Outfits.label>着装管理</Outfits.label>
   <Outfits.helpText>殖民者总是会尝试穿更新更好的衣服。\n\n你无需手动指派殖民者的每一项穿着设定（如果你想的话当然也是完全可以的）。\n\n通过打开「方案」标签页就可以为你的殖民者设计/安排着装方案了，</Outfits.helpText>

DefInjected/FactionDef/Factions_Hidden.xml

@@ -3,23 +3,23 @@
 
   <Spacer.label>太空人</Spacer.label>
   <Spacer.description>来自遥远太空的人类。</Spacer.description>
-  <Spacer.pawnsPlural>太空人</Spacer.pawnsPlural>
   <Spacer.fixedName>太空人</Spacer.fixedName>
+  <Spacer.pawnsPlural>太空人</Spacer.pawnsPlural>
 
   <SpacerHostile.label>太空人</SpacerHostile.label>
   <SpacerHostile.description>来自遥远太空的人类。</SpacerHostile.description>
-  <SpacerHostile.pawnsPlural>太空人</SpacerHostile.pawnsPlural>
   <SpacerHostile.fixedName>太空人</SpacerHostile.fixedName>
+  <SpacerHostile.pawnsPlural>太空人</SpacerHostile.pawnsPlural>
 
   <Mechanoid.label>机械族巢穴</Mechanoid.label>
   <Mechanoid.description>能自我复制的远古机械体的巢穴。</Mechanoid.description>
-  <Mechanoid.pawnsPlural>机械体</Mechanoid.pawnsPlural>
   <Mechanoid.fixedName>机械族巢穴</Mechanoid.fixedName>
+  <Mechanoid.pawnsPlural>机械体</Mechanoid.pawnsPlural>
 
   <Insect.label>虫巢</Insect.label>
   <Insect.description>通常具有攻击性与侵略性的昆虫。</Insect.description>
-  <Insect.pawnsPlural>昆虫</Insect.pawnsPlural>
   <Insect.fixedName>虫巢</Insect.fixedName>
+  <Insect.pawnsPlural>昆虫</Insect.pawnsPlural>
 
 
 </LanguageData>

DefInjected/GameConditionDef/GameConditions_Misc.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <SolarFlare.label>solar flare</SolarFlare.label>
+  <SolarFlare.description>A solar flare is hitting the planet. This creates extreme electrical interference and prevents most electrical devices from working.</SolarFlare.description>
+  <SolarFlare.endMessage>The solar flare is ending.</SolarFlare.endMessage>
+
+  <Eclipse.label>eclipse</Eclipse.label>
+  <Eclipse.description>An eclipse is shadowing the surface. It will be dark, even during the daytime.</Eclipse.description>
+  <Eclipse.endMessage>The eclipse is ending.</Eclipse.endMessage>
+
+  <PsychicDrone.label>psychic drone</PsychicDrone.label>
+  <PsychicDrone.description>A distant, powerful AI is emitting waves of psychic force that are driving people towards insanity.</PsychicDrone.description>
+  <PsychicDrone.endMessage>The psychic drone is ending.</PsychicDrone.endMessage>
+
+  <PsychicSoothe.label>psychic soothe</PsychicSoothe.label>
+  <PsychicSoothe.description>A distant, powerful AI is emitting waves of psychic force that are calming people and stabilizing their minds.</PsychicSoothe.description>
+  <PsychicSoothe.endMessage>The psychic soothe is ending.</PsychicSoothe.endMessage>
+
+  <ToxicFallout.label>toxic fallout</ToxicFallout.label>
+  <ToxicFallout.description>A plume of toxic dust from some distant source is slowly settling over this entire region of the planet. Anyone not under a roof will be slowly poisoned.</ToxicFallout.description>
+  <ToxicFallout.endMessage>The worst of the toxic fallout has settled.</ToxicFallout.endMessage>
+
+  <VolcanicWinter.label>volcanic winter</VolcanicWinter.label>
+  <VolcanicWinter.description>The atmosphere is choked with volcanic particles, significantly reducing the amount of light which reaches the surface. Temperatures will be colder and plants will grow slower.</VolcanicWinter.description>
+  <VolcanicWinter.endMessage>Most of the volcanic ash has settled.</VolcanicWinter.endMessage>
+
+  <HeatWave.label>heat wave</HeatWave.label>
+  <HeatWave.description>An extreme wave of heat is baking the area.</HeatWave.description>
+  <HeatWave.endMessage>The heat wave is over.</HeatWave.endMessage>
+
+  <ColdSnap.label>cold snap</ColdSnap.label>
+  <ColdSnap.description>An unusual cold snap is freezing the region.</ColdSnap.description>
+  <ColdSnap.endMessage>The cold snap is over.</ColdSnap.endMessage>
+
+  <Flashstorm.label>flashstorm</Flashstorm.label>
+  <Flashstorm.description>Extreme amounts of lightning are hitting a small region.</Flashstorm.description>
+  <Flashstorm.endMessage>The flashstorm is over.</Flashstorm.endMessage>
+
+  <ClimateCycle.label>climate cycle</ClimateCycle.label>
+  <ClimateCycle.description>A multi-year climate cycle due to an elliptical orbit.</ClimateCycle.description>
+
+  <Planetkiller.label>planetkiller</Planetkiller.label>
+  <Planetkiller.description>An interstellar planetkiller weapon is approaching this planet. When it hits, it will destroy all life.</Planetkiller.description>
+
+
+</LanguageData>

DefInjected/HediffDef/Ambrosia.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <AmbrosiaHigh.label>ambrosia warmth</AmbrosiaHigh.label>
+
+
+  <!-- Ambrosia addiction -->
+
+  <AmbrosiaTolerance.label>ambrosia tolerance</AmbrosiaTolerance.label>
+  <AmbrosiaTolerance.stages.1.label>small</AmbrosiaTolerance.stages.1.label>
+  <AmbrosiaTolerance.stages.2.label>large</AmbrosiaTolerance.stages.2.label>
+  <AmbrosiaTolerance.stages.3.label>massive</AmbrosiaTolerance.stages.3.label>
+
+  <AmbrosiaAddiction.label>ambrosia addiction</AmbrosiaAddiction.label>
+  <AmbrosiaAddiction.stages.1.label>withdrawal</AmbrosiaAddiction.stages.1.label>
+
+
+</LanguageData>

DefInjected/IncidentDef/Incidents_Bad_Disease.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <Disease_Flu.label>流感</Disease_Flu.label>
-  <Disease_Plague.label>瘟疫</Disease_Plague.label>
-  <Disease_Malaria.label>疟疾</Disease_Malaria.label>
-  <Disease_SleepingSickness.label>嗜睡病</Disease_SleepingSickness.label>
-  <Disease_FibrousMechanites.label>纤维纳米机械感染</Disease_FibrousMechanites.label>
-  <Disease_SensoryMechanites.label>感官纳米机械感染</Disease_SensoryMechanites.label>
-  <Disease_GutWorms.label>肠道蠕虫</Disease_GutWorms.label>
-  <Disease_MuscleParasites.label>肌肉寄生虫</Disease_MuscleParasites.label>
+  <!--<Disease_Flu.label>流感</Disease_Flu.label>-->
+  <!--<Disease_Plague.label>瘟疫</Disease_Plague.label>-->
+  <!--<Disease_Malaria.label>疟疾</Disease_Malaria.label>-->
+  <!--<Disease_SleepingSickness.label>嗜睡病</Disease_SleepingSickness.label>-->
+  <!--<Disease_FibrousMechanites.label>纤维纳米机械感染</Disease_FibrousMechanites.label>-->
+  <!--<Disease_SensoryMechanites.label>感官纳米机械感染</Disease_SensoryMechanites.label>-->
+  <!--<Disease_GutWorms.label>肠道蠕虫</Disease_GutWorms.label>-->
+  <!--<Disease_MuscleParasites.label>肌肉寄生虫</Disease_MuscleParasites.label>-->
 
 
 </LanguageData>

DefInjected/IncidentDef/Incidents_Bad_Misc.xml

@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <Eclipse.label>日蚀</Eclipse.label>
-  <Eclipse.letterLabel>日蚀</Eclipse.letterLabel>
-  <Eclipse.letterText>这个星球的月亮挡在了太阳和星球之间。日蚀已经开始。</Eclipse.letterText>
+  <!--<Eclipse.label>日蚀</Eclipse.label>-->
+  <!--<Eclipse.letterLabel>日蚀</Eclipse.letterLabel>-->
+  <!--<Eclipse.letterText>这个星球的月亮挡在了太阳和星球之间。日蚀已经开始。</Eclipse.letterText>-->
 
-  <SolarFlare.label>太阳耀斑</SolarFlare.label>
-  <SolarFlare.letterLabel>太阳耀斑</SolarFlare.letterLabel>
-  <SolarFlare.letterText>一场太阳耀斑开始了。\n\n极强的辐射让所有电气设施无法运转。\n\n它应该会在一天内结束。</SolarFlare.letterText>
+  <!--<SolarFlare.label>太阳耀斑</SolarFlare.label>-->
+  <!--<SolarFlare.letterLabel>太阳耀斑</SolarFlare.letterLabel>-->
+  <!--<SolarFlare.letterText>一场太阳耀斑开始了。\n\n极强的辐射让所有电气设施无法运转。\n\n它应该会在一天内结束。</SolarFlare.letterText>-->
 
-  <PsychicDrone.label>心灵低语</PsychicDrone.label>
+  <!--<PsychicDrone.label>心灵低语</PsychicDrone.label>-->
 
-  <ToxicFallout.label>有毒尘埃</ToxicFallout.label>
-  <ToxicFallout.letterLabel>有毒尘埃</ToxicFallout.letterLabel>
-  <ToxicFallout.letterText>遥远地方的一起化学品火灾释放的有毒尘埃弥漫了整个地区。\n\n不在屋顶下的人类和动物都会慢慢被有空气中的有毒粉尘致病。\n\n毒雾会持续在几天或超过一个月。</ToxicFallout.letterText>
+  <!--<ToxicFallout.label>有毒尘埃</ToxicFallout.label>-->
+  <!--<ToxicFallout.letterLabel>有毒尘埃</ToxicFallout.letterLabel>-->
+  <!--<ToxicFallout.letterText>遥远地方的一起化学品火灾释放的有毒尘埃弥漫了整个地区。\n\n不在屋顶下的人类和动物都会慢慢被有空气中的有毒粉尘致病。\n\n毒雾会持续在几天或超过一个月。</ToxicFallout.letterText>-->
 
-  <VolcanicWinter.label>火山冬天</VolcanicWinter.label>
-  <VolcanicWinter.letterLabel>火山冬天</VolcanicWinter.letterLabel>
-  <VolcanicWinter.letterText>一个遥远的超级火山爆发了，喷出的火山灰散布在数百万平方公里的大气中。\n\n火山灰在大气中遮蔽了太阳。气温下降、植物会缺乏阳光而枯萎。火山灰有可能在几周内散去，或者持续几个月。</VolcanicWinter.letterText>
+  <!--<VolcanicWinter.label>火山冬天</VolcanicWinter.label>-->
+  <!--<VolcanicWinter.letterLabel>火山冬天</VolcanicWinter.letterLabel>-->
+  <!--<VolcanicWinter.letterText>一个遥远的超级火山爆发了，喷出的火山灰散布在数百万平方公里的大气中。\n\n火山灰在大气中遮蔽了太阳。气温下降、植物会缺乏阳光而枯萎。火山灰有可能在几周内散去，或者持续几个月。</VolcanicWinter.letterText>-->
 
-  <HeatWave.label>热浪</HeatWave.label>
-  <HeatWave.letterLabel>热浪</HeatWave.letterLabel>
-  <HeatWave.letterText>一场罕见的热浪开始了。小心中暑。</HeatWave.letterText>
+  <!--<HeatWave.label>热浪</HeatWave.label>-->
+  <!--<HeatWave.letterLabel>热浪</HeatWave.letterLabel>-->
+  <!--<HeatWave.letterText>一场罕见的热浪开始了。小心中暑。</HeatWave.letterText>-->
 
-  <ColdSnap.label>寒流</ColdSnap.label>
-  <ColdSnap.letterLabel>寒流</ColdSnap.letterLabel>
-  <ColdSnap.letterText>一场罕见的寒流开始了。小心体温过低和作物死亡。</ColdSnap.letterText>
+  <!--<ColdSnap.label>寒流</ColdSnap.label>-->
+  <!--<ColdSnap.letterLabel>寒流</ColdSnap.letterLabel>-->
+  <!--<ColdSnap.letterText>一场罕见的寒流开始了。小心体温过低和作物死亡。</ColdSnap.letterText>-->
 
-  <Flashstorm.label>闪电风暴</Flashstorm.label>
-  <Flashstorm.letterLabel>闪电风暴</Flashstorm.letterLabel>
-  <Flashstorm.letterText>极少量的闪电击中一个小区域。这会引起巨大的火灾。</Flashstorm.letterText>
+  <!--<Flashstorm.label>闪电风暴</Flashstorm.label>-->
+  <!--<Flashstorm.letterLabel>闪电风暴</Flashstorm.letterLabel>-->
+  <!--<Flashstorm.letterText>极少量的闪电击中一个小区域。这会引起巨大的火灾。</Flashstorm.letterText>-->
 
-  <ShortCircuit.label>短路</ShortCircuit.label>
-  <CropBlight.label>枯萎病</CropBlight.label>
-  <Alphabeavers.label>阿尔法海狸</Alphabeavers.label>
+  <!--<ShortCircuit.label>短路</ShortCircuit.label>-->
+  <!--<CropBlight.label>枯萎病</CropBlight.label>-->
+  <!--<Alphabeavers.label>阿尔法海狸</Alphabeavers.label>-->
 
 
 </LanguageData>

DefInjected/IncidentDef/Incidents_Bad_ThreatsBig.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <RaidEnemy.label>袭击</RaidEnemy.label>
+  <!--<RaidEnemy.label>袭击</RaidEnemy.label>-->
 
-  <Infestation.label>虫害</Infestation.label>
-  <Infestation.letterLabel>虫害</Infestation.letterLabel>
-  <Infestation.letterText>一个虫巢出现了！\n\n它会慢慢繁殖出巨型昆虫和新巢穴。如果你不想让它遍布整个地区，请聚集军队摧毁它。但要小心，这些虫子会保护它们的巢穴。</Infestation.letterText>
+  <!--<Infestation.label>虫害</Infestation.label>-->
+  <!--<Infestation.letterLabel>虫害</Infestation.letterLabel>-->
+  <!--<Infestation.letterText>一个虫巢出现了！\n\n它会慢慢繁殖出巨型昆虫和新巢穴。如果你不想让它遍布整个地区，请聚集军队摧毁它。但要小心，这些虫子会保护它们的巢穴。</Infestation.letterText>-->
 
-  <ManhunterPack.label>猎杀人类</ManhunterPack.label>
+  <!--<ManhunterPack.label>猎杀人类</ManhunterPack.label>-->
 
-  <PsychicEmanatorShipPartCrash.label>飞船部件坠毁（灵能）</PsychicEmanatorShipPartCrash.label>
-  <PsychicEmanatorShipPartCrash.letterLabel>心灵飞船</PsychicEmanatorShipPartCrash.letterLabel>
-  <PsychicEmanatorShipPartCrash.letterText>一艘古老的飞船在附近坠毁了。\n\n殖民者感应到一种不可未知的危险。飞船残骸中肯定有个拥有心理投射能力的人工智能。看起来这个人工智能还不太友善。\n\n尽可能快地摧毁它。</PsychicEmanatorShipPartCrash.letterText>
+  <!--<PsychicEmanatorShipPartCrash.label>飞船部件坠毁（灵能）</PsychicEmanatorShipPartCrash.label>-->
+  <!--<PsychicEmanatorShipPartCrash.letterLabel>心灵飞船</PsychicEmanatorShipPartCrash.letterLabel>-->
+  <!--<PsychicEmanatorShipPartCrash.letterText>一艘古老的飞船在附近坠毁了。\n\n殖民者感应到一种不可未知的危险。飞船残骸中肯定有个拥有心理投射能力的人工智能。看起来这个人工智能还不太友善。\n\n尽可能快地摧毁它。</PsychicEmanatorShipPartCrash.letterText>-->
 
-  <PoisonShipPartCrash.label>飞船部件坠毁（毒性）</PoisonShipPartCrash.label>
-  <PoisonShipPartCrash.letterLabel>有毒飞船</PoisonShipPartCrash.letterLabel>
-  <PoisonShipPartCrash.letterText>一艘古老的飞船在附近坠毁了。\n\n从残骸中蔓延的毒气会毒死附近的植物。\n\n尽可能快地摧毁它。</PoisonShipPartCrash.letterText>
+  <!--<PoisonShipPartCrash.label>飞船部件坠毁（毒性）</PoisonShipPartCrash.label>-->
+  <!--<PoisonShipPartCrash.letterLabel>有毒飞船</PoisonShipPartCrash.letterLabel>-->
+  <!--<PoisonShipPartCrash.letterText>一艘古老的飞船在附近坠毁了。\n\n从残骸中蔓延的毒气会毒死附近的植物。\n\n尽可能快地摧毁它。</PoisonShipPartCrash.letterText>-->
 
-  <AnimalInsanityMass.label>大量动物发狂</AnimalInsanityMass.label>
+  <!--<AnimalInsanityMass.label>大量动物发狂</AnimalInsanityMass.label>-->
 
 
 </LanguageData>

DefInjected/IncidentDef/Incidents_Bad_ThreatsSmall.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <AnimalInsanitySingle.label>动物发狂</AnimalInsanitySingle.label>
+  <!--<AnimalInsanitySingle.label>动物发狂</AnimalInsanitySingle.label>-->
 
 
 </LanguageData>

DefInjected/IncidentDef/Incidents_Caravan.xml

@@ -3,25 +3,25 @@
 
   <!-- Ambush -->
 
-  <Ambush.label>伏击</Ambush.label>
-  <Ambush.letterText>你的远行队正遭受来自{1}的{0}的伏击！</Ambush.letterText>
-  <Ambush.letterLabel>远行队遭伏击</Ambush.letterLabel>
+  <!--<Ambush.label>伏击</Ambush.label>-->
+  <!--<Ambush.letterText>你的远行队被来自{1}的{0}的伏击了！</Ambush.letterText>-->
+  <!--<Ambush.letterLabel>远行队遭遇伏击</Ambush.letterLabel>-->
 
-  <ManhunterAmbush.label>猎杀人类伏击</ManhunterAmbush.label>
-  <ManhunterAmbush.letterText>你的远行队被猎杀人类的{0}伏击了!</ManhunterAmbush.letterText>
-  <ManhunterAmbush.letterLabel>远行队遭伏击（猎杀人类）</ManhunterAmbush.letterLabel>
+  <!--<ManhunterAmbush.label>猎杀人类伏击</ManhunterAmbush.label>-->
+  <!--<ManhunterAmbush.letterText>你的远行队被猎杀人类的{0}伏击了!</ManhunterAmbush.letterText>-->
+  <!--<ManhunterAmbush.letterLabel>远行队遭遇伏击（猎杀人类）</ManhunterAmbush.letterLabel>-->
 
 
   <!-- Caravan meeting -->
 
-  <CaravanMeeting.label>远行队相遇</CaravanMeeting.label>
+  <!--<CaravanMeeting.label>远行队相遇</CaravanMeeting.label>-->
 
 
   <!-- Payment demand -->
 
-  <CaravanDemand.label>payment demand</CaravanDemand.label>
-  <CaravanDemand.letterText>Your caravan has been ambushed by {0} from {1}!</CaravanDemand.letterText>
-  <CaravanDemand.letterLabel>Caravan ambushed</CaravanDemand.letterLabel>
+  <!--<CaravanDemand.label>打劫</CaravanDemand.label>-->
+  <!--<CaravanDemand.letterText>你的远行队被来自{1}的{0}的伏击了！</CaravanDemand.letterText>-->
+  <!--<CaravanDemand.letterLabel>远行队遭遇伏击</CaravanDemand.letterLabel>-->
 
 
 </LanguageData>

DefInjected/IncidentDef/Incidents_Caravan_All.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <!-- Threats -->
+
+  <Ambush.label>伏击</Ambush.label>
+  <Ambush.letterText>你的远行队被来自{1}的{0}的伏击了！</Ambush.letterText>
+  <Ambush.letterLabel>远行队遭遇伏击</Ambush.letterLabel>
+
+  <ManhunterAmbush.label>猎杀人类伏击</ManhunterAmbush.label>
+  <ManhunterAmbush.letterText>你的远行队被猎杀人类的{0}伏击了!</ManhunterAmbush.letterText>
+  <ManhunterAmbush.letterLabel>远行队遭遇伏击（猎杀人类）</ManhunterAmbush.letterLabel>
+
+
+  <!-- Good -->
+
+  <CaravanMeeting.label>远行队相遇</CaravanMeeting.label>
+
+
+  <!-- Bad -->
+
+  <CaravanDemand.label>打劫</CaravanDemand.label>
+  <CaravanDemand.letterText>你的远行队被来自{1}的{0}的伏击了！</CaravanDemand.letterText>
+  <CaravanDemand.letterLabel>远行队遭遇伏击</CaravanDemand.letterLabel>
+
+
+</LanguageData>

DefInjected/IncidentDef/Incidents_Good_Misc.xml

@@ -3,34 +3,34 @@
 
   <!-- ShipChunkDrop -->
 
-  <ShipChunkDrop.label>飞船残骸坠落</ShipChunkDrop.label>
+  <!--<ShipChunkDrop.label>飞船残骸坠落</ShipChunkDrop.label>-->
 
 
   <!-- OrbitalVisitor -->
 
-  <OrbitalTraderArrival.label>轨道贸易商</OrbitalTraderArrival.label>
+  <!--<OrbitalTraderArrival.label>轨道贸易商</OrbitalTraderArrival.label>-->
 
 
   <!-- AllyArrival -->
 
-  <TraderCaravanArrival.label>贸易商队</TraderCaravanArrival.label>
-  <VisitorGroup.label>访客</VisitorGroup.label>
-  <TravelerGroup.label>旅行者</TravelerGroup.label>
+  <!--<TraderCaravanArrival.label>贸易商队</TraderCaravanArrival.label>-->
+  <!--<VisitorGroup.label>访客</VisitorGroup.label>-->
+  <!--<TravelerGroup.label>旅行者</TravelerGroup.label>-->
 
 
   <!-- Population gain -->
 
-  <WandererJoin.label>流浪者加入</WandererJoin.label>
-  <RefugeePodCrash.label>逃生舱坠毁</RefugeePodCrash.label>
+  <!--<WandererJoin.label>流浪者加入</WandererJoin.label>-->
+  <!--<RefugeePodCrash.label>逃生舱坠毁</RefugeePodCrash.label>-->
 
 
   <!-- Misc -->
 
-  <ResourcePodCrash.label>资源舱坠毁</ResourcePodCrash.label>
-  <RaidFriendly.label>友军的袭击</RaidFriendly.label>
-  <PsychicSoothe.label>心灵抚慰波</PsychicSoothe.label>
-  <SelfTame.label>野兽自行驯服</SelfTame.label>
-  <FarmAnimalsWanderIn.label>家养动物加入</FarmAnimalsWanderIn.label>
+  <!--<ResourcePodCrash.label>资源舱坠毁</ResourcePodCrash.label>-->
+  <!--<RaidFriendly.label>友军的袭击</RaidFriendly.label>-->
+  <!--<PsychicSoothe.label>心灵抚慰波</PsychicSoothe.label>-->
+  <!--<SelfTame.label>野兽自行驯服</SelfTame.label>-->
+  <!--<FarmAnimalsWanderIn.label>家养动物加入</FarmAnimalsWanderIn.label>-->
 
 
 </LanguageData>

DefInjected/IncidentDef/Incidents_Map_Disease.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <Disease_Flu.label>流感</Disease_Flu.label>
+  <Disease_Plague.label>瘟疫</Disease_Plague.label>
+  <Disease_Malaria.label>疟疾</Disease_Malaria.label>
+  <Disease_SleepingSickness.label>嗜睡病</Disease_SleepingSickness.label>
+  <Disease_FibrousMechanites.label>纤维纳米机械感染</Disease_FibrousMechanites.label>
+  <Disease_SensoryMechanites.label>感官纳米机械感染</Disease_SensoryMechanites.label>
+  <Disease_GutWorms.label>肠道蠕虫</Disease_GutWorms.label>
+  <Disease_MuscleParasites.label>肌肉寄生虫</Disease_MuscleParasites.label>
+
+
+</LanguageData>

DefInjected/IncidentDef/Incidents_Map_Misc.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <!-- Good -->
+
+  <ResourcePodCrash.label>资源舱坠毁</ResourcePodCrash.label>
+  <PsychicSoothe.label>心灵抚慰波</PsychicSoothe.label>
+  <SelfTame.label>野兽自行驯服</SelfTame.label>
+
+  <AmbrosiaSprout.label>ambrosia sprout</AmbrosiaSprout.label>
+  <AmbrosiaSprout.letterText>A grove of the mysterious ambrosia bush has sprouted nearby! If you wait for the plants to grow, you'll be able to harvest the delicious, pleasurable, and slightly addictive fruit.</AmbrosiaSprout.letterText>
+  <AmbrosiaSprout.letterLabel>Ambrosia sprout</AmbrosiaSprout.letterLabel>
+
+  <FarmAnimalsWanderIn.label>家养动物加入</FarmAnimalsWanderIn.label>
+  <WandererJoin.label>流浪者加入</WandererJoin.label>
+  <RefugeePodCrash.label>逃生舱坠毁</RefugeePodCrash.label>
+
+
+  <!-- Neutral -->
+
+  <RefugeeChased.label>被追捕的逃生者</RefugeeChased.label>
+  <ThrumboPasses.label>敲击兽经过</ThrumboPasses.label>
+  <RansomDemand.label>索取赎金</RansomDemand.label>
+  <CaravanRequest.label>caravan request</CaravanRequest.label>
+
+
+  <!-- Bad -->
+
+  <PsychicDrone.label>心灵低语</PsychicDrone.label>
+
+  <ToxicFallout.label>有毒尘埃</ToxicFallout.label>
+  <ToxicFallout.letterText>遥远地方的一起化学品火灾释放的有毒尘埃弥漫了整个地区。\n\n不在屋顶下的人类和动物都会慢慢被有空气中的有毒粉尘致病。\n\n毒雾会持续在几天或超过一个月。</ToxicFallout.letterText>
+  <ToxicFallout.letterLabel>有毒尘埃</ToxicFallout.letterLabel>
+
+  <VolcanicWinter.label>火山冬天</VolcanicWinter.label>
+  <VolcanicWinter.letterText>一个遥远的超级火山爆发了，喷出的火山灰散布在数百万平方公里的大气中。\n\n火山灰在大气中遮蔽了太阳。气温下降、植物会缺乏阳光而枯萎。火山灰有可能在几周内散去，或者持续几个月。</VolcanicWinter.letterText>
+  <VolcanicWinter.letterLabel>火山冬天</VolcanicWinter.letterLabel>
+
+  <HeatWave.label>热浪</HeatWave.label>
+  <HeatWave.letterText>一场罕见的热浪开始了。小心中暑。</HeatWave.letterText>
+  <HeatWave.letterLabel>热浪</HeatWave.letterLabel>
+
+  <ColdSnap.label>寒流</ColdSnap.label>
+  <ColdSnap.letterText>一场罕见的寒流开始了。小心体温过低和作物死亡。</ColdSnap.letterText>
+  <ColdSnap.letterLabel>寒流</ColdSnap.letterLabel>
+
+  <Flashstorm.label>闪电风暴</Flashstorm.label>
+  <Flashstorm.letterText>极少量的闪电击中一个小区域。这会引起巨大的火灾。</Flashstorm.letterText>
+  <Flashstorm.letterLabel>闪电风暴</Flashstorm.letterLabel>
+
+  <ShortCircuit.label>短路</ShortCircuit.label>
+  <CropBlight.label>枯萎病</CropBlight.label>
+  <Alphabeavers.label>阿尔法海狸</Alphabeavers.label>
+
+
+</LanguageData>

DefInjected/IncidentDef/Incidents_Map_Threats.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <!-- Big threats -->
+
+  <RaidEnemy.label>袭击</RaidEnemy.label>
+
+  <Infestation.label>虫害</Infestation.label>
+  <Infestation.letterText>一个虫巢出现了！\n\n它会慢慢繁殖出巨型昆虫和新巢穴。如果你不想让它遍布整个地区，请聚集军队摧毁它。但要小心，这些虫子会保护它们的巢穴。</Infestation.letterText>
+  <Infestation.letterLabel>虫害</Infestation.letterLabel>
+
+  <ManhunterPack.label>猎杀人类</ManhunterPack.label>
+
+  <PsychicEmanatorShipPartCrash.label>飞船部件坠毁（灵能）</PsychicEmanatorShipPartCrash.label>
+  <PsychicEmanatorShipPartCrash.letterText>一艘古老的飞船在附近坠毁了。\n\n殖民者感应到一种不可未知的危险。飞船残骸中肯定有个拥有心理投射能力的人工智能。看起来这个人工智能还不太友善。\n\n尽可能快地摧毁它。</PsychicEmanatorShipPartCrash.letterText>
+  <PsychicEmanatorShipPartCrash.letterLabel>心灵飞船</PsychicEmanatorShipPartCrash.letterLabel>
+
+  <PoisonShipPartCrash.label>飞船部件坠毁（毒性）</PoisonShipPartCrash.label>
+  <PoisonShipPartCrash.letterText>一艘古老的飞船在附近坠毁了。\n\n从残骸中蔓延的毒气会毒死附近的植物。\n\n尽可能快地摧毁它。</PoisonShipPartCrash.letterText>
+  <PoisonShipPartCrash.letterLabel>有毒飞船</PoisonShipPartCrash.letterLabel>
+
+  <AnimalInsanityMass.label>大量动物发狂</AnimalInsanityMass.label>
+
+
+  <!-- Small threats -->
+
+  <AnimalInsanitySingle.label>动物发狂</AnimalInsanitySingle.label>
+
+
+</LanguageData>

DefInjected/IncidentDef/Incidents_Map_Various.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <!-- ShipChunkDrop -->
+
+  <ShipChunkDrop.label>飞船残骸坠落</ShipChunkDrop.label>
+
+
+  <!-- OrbitalVisitor -->
+
+  <OrbitalTraderArrival.label>轨道贸易商</OrbitalTraderArrival.label>
+
+
+  <!-- AllyArrival -->
+
+  <TraderCaravanArrival.label>贸易商队</TraderCaravanArrival.label>
+  <VisitorGroup.label>访客</VisitorGroup.label>
+  <TravelerGroup.label>旅行者</TravelerGroup.label>
+
+
+  <!-- AllyAssistance -->
+
+  <RaidFriendly.label>友军的袭击</RaidFriendly.label>
+
+
+</LanguageData>

DefInjected/IncidentDef/Incidents_Neutral_Misc.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <RefugeeChased.label>被追捕的逃生者</RefugeeChased.label>
-  <ThrumboPasses.label>敲击兽经过</ThrumboPasses.label>
-  <RansomDemand.label>索取赎金</RansomDemand.label>
-  <CaravanRequest.label>caravan request</CaravanRequest.label>
+  <!--<RefugeeChased.label>被追捕的逃生者</RefugeeChased.label>-->
+  <!--<ThrumboPasses.label>敲击兽经过</ThrumboPasses.label>-->
+  <!--<RansomDemand.label>索取赎金</RansomDemand.label>-->
+  <!--<CaravanRequest.label>caravan request</CaravanRequest.label>-->
 
 
 </LanguageData>

DefInjected/IncidentDef/Incidents_Special.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <JourneyOffer.label>旅行邀請</JourneyOffer.label>
+  <!--<JourneyOffer.label>旅行邀請</JourneyOffer.label>-->
 
 
 </LanguageData>

DefInjected/IncidentDef/Incidents_World_Misc.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <!-- World conditions -->
+
+  <Eclipse.label>日蚀</Eclipse.label>
+  <Eclipse.letterText>这个星球的月亮挡在了太阳和星球之间。日蚀已经开始。</Eclipse.letterText>
+  <Eclipse.letterLabel>日蚀</Eclipse.letterLabel>
+
+  <SolarFlare.label>太阳耀斑</SolarFlare.label>
+  <SolarFlare.letterText>一场太阳耀斑开始了。\n\n极强的辐射让所有电气设施无法运转。\n\n它应该会在一天内结束。</SolarFlare.letterText>
+  <SolarFlare.letterLabel>太阳耀斑</SolarFlare.letterLabel>
+
+
+  <!-- Site destination spawners -->
+
+  <QuestBanditCamp.label>bandit camp opportunity</QuestBanditCamp.label>
+  <QuestBanditCamp.letterText>{0}, {1} of {2}, has sent us a message.\n\nApparently bandits based in a nearby camp have been raiding their caravans. They've asked us to destroy it, which means eliminating all enemies and turrets.\n\nIf we succeed, their relations will improve, and they'll send us this reward:\n\n{3}</QuestBanditCamp.letterText>
+  <QuestBanditCamp.letterLabel>Bandit camp opportunity</QuestBanditCamp.letterLabel>
+
+  <QuestItemStash.label>item stash opportunity</QuestItemStash.label>
+  <QuestItemStash.letterText>{0}, {1} of {2}, has sent us a message.\n\nThey've learned that a collection of valuable items have been left for the taking not far from us. The collection consists of:\n\n{3}\n\nUnfortunately, it won’t last - others will take the items in {4} days if we don't.\n\nValuables tend to attract danger, so beware.\n\n{5}</QuestItemStash.letterText>
+  <QuestItemStash.letterLabel>Item stash opportunity</QuestItemStash.letterLabel>
+
+
+</LanguageData>

DefInjected/IncidentDef/Incidents_World_Special.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <JourneyOffer.label>旅行邀請</JourneyOffer.label>
+
+
+</LanguageData>

DefInjected/InstructionDef/Instructions.xml

@@ -30,24 +30,24 @@
   <BuildRoomWalls.onMapInstruction>建造木墙</BuildRoomWalls.onMapInstruction>
 
   <BuildRoomDoor.text>在墙的中间放一扇门即可。\n\n门就在墙的菜单栏旁边。</BuildRoomDoor.text>
-  <BuildRoomDoor.onMapInstruction>在墙上建个门</BuildRoomDoor.onMapInstruction>
   <BuildRoomDoor.rejectInputMessage>请在墙上建立一个木门</BuildRoomDoor.rejectInputMessage>
+  <BuildRoomDoor.onMapInstruction>在墙上建个门</BuildRoomDoor.onMapInstruction>
 
   <BuildBeds.text>你的殖民者们已经有房间了！\n\n他们需要休息，在房间里放三张床吧。\n\n你可以在「家具」菜单里找到「单人床」。</BuildBeds.text>
-  <BuildBeds.onMapInstruction>需要建造三张木床。</BuildBeds.onMapInstruction>
   <BuildBeds.rejectInputMessage>请在房间里造木床。</BuildBeds.rejectInputMessage>
+  <BuildBeds.onMapInstruction>需要建造三张木床。</BuildBeds.onMapInstruction>
 
   <BuildTorchLamp.text>你还需要在室内建设一些光源，殖民者在黑暗中会不快。\n\n在房间里造一个「火把」。</BuildTorchLamp.text>
-  <BuildTorchLamp.onMapInstruction>请在房间里造一个火把</BuildTorchLamp.onMapInstruction>
   <BuildTorchLamp.rejectInputMessage>请在房间里造一个火把</BuildTorchLamp.rejectInputMessage>
+  <BuildTorchLamp.onMapInstruction>请在房间里造一个火把</BuildTorchLamp.onMapInstruction>
 
   <BuildAnimalSleepingSpot.text>你还需要给你的宠物一个睡觉的地方。\n\n动物睡眠点并不是一个真正的设施，只是一个指定的休息地点。</BuildAnimalSleepingSpot.text>
-  <BuildAnimalSleepingSpot.onMapInstruction>请给你的宠物在室内指定一个动物睡眠点</BuildAnimalSleepingSpot.onMapInstruction>
   <BuildAnimalSleepingSpot.rejectInputMessage>请给你的宠物指定一个动物睡眠点</BuildAnimalSleepingSpot.rejectInputMessage>
+  <BuildAnimalSleepingSpot.onMapInstruction>请给你的宠物在室内指定一个动物睡眠点</BuildAnimalSleepingSpot.onMapInstruction>
 
   <BuildHorseshoesPin.text>你的殖民者需要找点乐子打发时间。\n\n在屋外造一个「马蹄钉」。</BuildHorseshoesPin.text>
-  <BuildHorseshoesPin.onMapInstruction>在屋外造一个马蹄钉</BuildHorseshoesPin.onMapInstruction>
   <BuildHorseshoesPin.rejectInputMessage>请在房屋附近造一个马蹄钉</BuildHorseshoesPin.rejectInputMessage>
+  <BuildHorseshoesPin.onMapInstruction>在屋外造一个马蹄钉</BuildHorseshoesPin.onMapInstruction>
 
   <MakeGrowingZone.text>房子造好了！\n\n接下来解决吃饭问题！规划一个「种植区」。\n\n你的殖民者会在这里种植作物。</MakeGrowingZone.text>
   <MakeGrowingZone.rejectInputMessage>请在指定的地点规划一个种植区</MakeGrowingZone.rejectInputMessage>
@@ -62,8 +62,8 @@
   <EquipWeapons.onMapInstruction>装备这个</EquipWeapons.onMapInstruction>
 
   <BuildFueledStove.text>不错！\n\n现在需要造一个炉灶来烹饪。\n\n在之前的房间里造一个燃料炉灶。</BuildFueledStove.text>
-  <BuildFueledStove.onMapInstruction>请在室内造炉灶</BuildFueledStove.onMapInstruction>
   <BuildFueledStove.rejectInputMessage>请在你之前建造的房间内造炉灶</BuildFueledStove.rejectInputMessage>
+  <BuildFueledStove.onMapInstruction>请在室内造炉灶</BuildFueledStove.onMapInstruction>
 
   <AddBillSimpleMeal.text>现在你可以安排殖民者来做饭了。\n\n对炉子下达特定的烹饪清单后，殖民者们就会开始做饭。\n\n1. 等待炉子建好\n2. 在菜单中选择「烹饪简单食物」\n3. 将订单数量调整至「10」\n\n记住，你可以随时加速时间流逝速度。你还可以选中殖民者并右击炉灶以优先进行烹饪。</AddBillSimpleMeal.text>
   <AddBillSimpleMeal.rejectInputMessage>请在炉子上下达烹饪清单。</AddBillSimpleMeal.rejectInputMessage>
@@ -83,8 +83,8 @@
   <ChangeWorkSettings.rejectInputMessage>请打开工作面板并做一些调整</ChangeWorkSettings.rejectInputMessage>
 
   <BuildSimpleResearchBench.text>知识就是力量，研究才能进步。\n\n先来建造一个「基础研究台」。</BuildSimpleResearchBench.text>
-  <BuildSimpleResearchBench.onMapInstruction>在之前的房间中建造一个木制的基础研究台。</BuildSimpleResearchBench.onMapInstruction>
   <BuildSimpleResearchBench.rejectInputMessage>请在之前建造的房间中建造一个木制的基础研究台。</BuildSimpleResearchBench.rejectInputMessage>
+  <BuildSimpleResearchBench.onMapInstruction>在之前的房间中建造一个木制的基础研究台。</BuildSimpleResearchBench.onMapInstruction>
 
   <OpenMainTabResearch.text>太棒了！让我们研究点什么吧！\n\n请打开「研究」面板。</OpenMainTabResearch.text>
   <OpenMainTabResearch.rejectInputMessage>请打开「研究」面板。</OpenMainTabResearch.rejectInputMessage>

DefInjected/InteractionDef/Interactions_Animal.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <AnimalChat.label>与动物交流</AnimalChat.label>

DefInjected/InteractionDef/Interactions_Directed.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <BuildRapport.label>尝试交流</BuildRapport.label>

DefInjected/InteractionDef/Interactions_Romance.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <RomanceAttempt.label>求爱</RomanceAttempt.label>

DefInjected/InteractionDef/Interactions_Social.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <!-- Random social interactions -->

DefInjected/ItemCollectionGeneratorDef/ItemCollectionGenerators_General.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <RandomGeneralGoods.label>general goods</RandomGeneralGoods.label>
+  <Apparel.label>apparel</Apparel.label>
+  <Weapons.label>weapons</Weapons.label>
+  <Artifacts.label>artifacts</Artifacts.label>
+  <RawResources.label>raw resources</RawResources.label>
+  <AIPersonaCores.label>AI persona cores</AIPersonaCores.label>
+  <Neurotrainers.label>neurotrainers</Neurotrainers.label>
+
+
+</LanguageData>

DefInjected/ItemCollectionGeneratorDef/ItemCollectionGenerators_Specific.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <AncientTempleContents.label>ancient temple contents</AncientTempleContents.label>
+  <AncientPodContents.label>ancient pod contents</AncientPodContents.label>
+  <DebugCaravanInventory.label>debug caravan inventory</DebugCaravanInventory.label>
+  <TraderStock.label>trader stock</TraderStock.label>
+  <CaravanRequestRewards.label>caravan request rewards</CaravanRequestRewards.label>
+  <BanditCampQuestRewards.label>bandit camp quest rewards</BanditCampQuestRewards.label>
+
+
+</LanguageData>

DefInjected/MapConditionDef/MapConditions_Misc.xml

@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <SolarFlare.label>太阳耀斑</SolarFlare.label>
-  <SolarFlare.description>一场太阳耀斑正在冲击这个星球，这将产生强大的电磁干扰并让绝大多数电气设备无法运转。</SolarFlare.description>
-  <SolarFlare.endMessage>太阳耀斑结束了。</SolarFlare.endMessage>
+  <!--<SolarFlare.label>太阳耀斑</SolarFlare.label>-->
+  <!--<SolarFlare.description>一场太阳耀斑正在冲击这个星球，这将产生强大的电磁干扰并让绝大多数电气设备无法运转。</SolarFlare.description>-->
+  <!--<SolarFlare.endMessage>太阳耀斑结束了。</SolarFlare.endMessage>-->
 
-  <Eclipse.label>日蚀</Eclipse.label>
-  <Eclipse.description>一个天体的影子投在了这个星球上，造成了一场日蚀。日蚀期间即使在白天也会很暗。</Eclipse.description>
-  <Eclipse.endMessage>日蚀结束了。</Eclipse.endMessage>
+  <!--<Eclipse.label>日蚀</Eclipse.label>-->
+  <!--<Eclipse.description>一个天体的影子投在了这个星球上，造成了一场日蚀。日蚀期间即使在白天也会很暗。</Eclipse.description>-->
+  <!--<Eclipse.endMessage>日蚀结束了。</Eclipse.endMessage>-->
 
-  <PsychicDrone.label>心灵低语</PsychicDrone.label>
-  <PsychicDrone.description>一个在遥远地区的强大AI正在发射能让人发疯的心灵波。</PsychicDrone.description>
-  <PsychicDrone.endMessage>心灵冲击波结束了。</PsychicDrone.endMessage>
+  <!--<PsychicDrone.label>心灵低语</PsychicDrone.label>-->
+  <!--<PsychicDrone.description>一个在遥远地区的强大AI正在发射能让人发疯的心灵波。</PsychicDrone.description>-->
+  <!--<PsychicDrone.endMessage>心灵冲击波结束了。</PsychicDrone.endMessage>-->
 
-  <PsychicSoothe.label>心灵抚慰波</PsychicSoothe.label>
-  <PsychicSoothe.description>一个在遥远地区的强大AI正在发射能让人平静和安定的心灵波。</PsychicSoothe.description>
-  <PsychicSoothe.endMessage>心灵抚慰波结束了。</PsychicSoothe.endMessage>
+  <!--<PsychicSoothe.label>心灵抚慰波</PsychicSoothe.label>-->
+  <!--<PsychicSoothe.description>一个在遥远地区的强大AI正在发射能让人平静和安定的心灵波。</PsychicSoothe.description>-->
+  <!--<PsychicSoothe.endMessage>心灵抚慰波结束了。</PsychicSoothe.endMessage>-->
 
-  <ToxicFallout.label>有毒尘埃</ToxicFallout.label>
-  <ToxicFallout.description>从遥远地域弥漫过来的毒尘正在星球的整个区域慢慢沉淀。任何不在屋顶下的人类和动物都会慢慢中毒。</ToxicFallout.description>
-  <ToxicFallout.endMessage>有毒尘埃已基本消散了。</ToxicFallout.endMessage>
+  <!--<ToxicFallout.label>有毒尘埃</ToxicFallout.label>-->
+  <!--<ToxicFallout.description>从遥远地域弥漫过来的毒尘正在星球的整个区域慢慢沉淀。任何不在屋顶下的人类和动物都会慢慢中毒。</ToxicFallout.description>-->
+  <!--<ToxicFallout.endMessage>有毒尘埃已基本消散了。</ToxicFallout.endMessage>-->
 
-  <VolcanicWinter.label>火山冬天</VolcanicWinter.label>
-  <VolcanicWinter.description>大气层被火山灰遮蔽，到达地面的阳光减弱。气温下降，植物生长速度减缓。</VolcanicWinter.description>
-  <VolcanicWinter.endMessage>火山灰已基本消散了。</VolcanicWinter.endMessage>
+  <!--<VolcanicWinter.label>火山冬天</VolcanicWinter.label>-->
+  <!--<VolcanicWinter.description>大气层被火山灰遮蔽，到达地面的阳光减弱。气温下降，植物生长速度减缓。</VolcanicWinter.description>-->
+  <!--<VolcanicWinter.endMessage>火山灰已基本消散了。</VolcanicWinter.endMessage>-->
 
-  <HeatWave.label>热浪</HeatWave.label>
-  <HeatWave.description>一股温度极高的热浪正在烘烤这片区域。</HeatWave.description>
-  <HeatWave.endMessage>热浪结束了。</HeatWave.endMessage>
+  <!--<HeatWave.label>热浪</HeatWave.label>-->
+  <!--<HeatWave.description>一股温度极高的热浪正在烘烤这片区域。</HeatWave.description>-->
+  <!--<HeatWave.endMessage>热浪结束了。</HeatWave.endMessage>-->
 
-  <ColdSnap.label>寒流</ColdSnap.label>
-  <ColdSnap.description>一股罕见的寒流正在冻结这片区域。</ColdSnap.description>
-  <ColdSnap.endMessage>寒流结束了。</ColdSnap.endMessage>
+  <!--<ColdSnap.label>寒流</ColdSnap.label>-->
+  <!--<ColdSnap.description>一股罕见的寒流正在冻结这片区域。</ColdSnap.description>-->
+  <!--<ColdSnap.endMessage>寒流结束了。</ColdSnap.endMessage>-->
 
-  <Flashstorm.label>闪电风暴</Flashstorm.label>
-  <Flashstorm.description>极少量的闪电击中一个小区域。</Flashstorm.description>
-  <Flashstorm.endMessage>闪电风暴结束了。</Flashstorm.endMessage>
+  <!--<Flashstorm.label>闪电风暴</Flashstorm.label>-->
+  <!--<Flashstorm.description>极少量的闪电击中一个小区域。</Flashstorm.description>-->
+  <!--<Flashstorm.endMessage>闪电风暴结束了。</Flashstorm.endMessage>-->
 
-  <ClimateCycle.label>气候循环</ClimateCycle.label>
-  <ClimateCycle.description>由于此星球的公转轨道为椭圆形，因此气候循环需要花费数年。</ClimateCycle.description>
+  <!--<ClimateCycle.label>气候循环</ClimateCycle.label>-->
+  <!--<ClimateCycle.description>由于此星球的公转轨道为椭圆形，因此气候循环需要花费数年。</ClimateCycle.description>-->
 
-  <Planetkiller.label>行星毁灭</Planetkiller.label>
-  <Planetkiller.description>一个星际歼星武器正在接近这颗星球。当其命中时，所有生命将会被毁灭。</Planetkiller.description>
+  <!--<Planetkiller.label>行星毁灭</Planetkiller.label>-->
+  <!--<Planetkiller.description>一个星际歼星武器正在接近这颗星球。当其命中时，所有生命将会被毁灭。</Planetkiller.description>-->
 
 
 </LanguageData>

DefInjected/MentalStateDef/MentalStates_Mood.xml

@@ -4,20 +4,20 @@
   <!-- Mental breaks: extreme -->
 
   <Berserk.label>狂暴</Berserk.label>
-  <Berserk.beginLetterLabel>狂暴</Berserk.beginLetterLabel>
   <Berserk.beginLetter>{0} 已经变得狂暴！</Berserk.beginLetter>
+  <Berserk.beginLetterLabel>狂暴</Berserk.beginLetterLabel>
   <Berserk.recoveryMessage>{0}的狂暴已经结束。</Berserk.recoveryMessage>
   <Berserk.baseInspectLine>失控：狂暴</Berserk.baseInspectLine>
 
   <FireStartingSpree.label>纵火</FireStartingSpree.label>
-  <FireStartingSpree.beginLetterLabel>纵火</FireStartingSpree.beginLetterLabel>
   <FireStartingSpree.beginLetter>{0}正在四处纵火！</FireStartingSpree.beginLetter>
+  <FireStartingSpree.beginLetterLabel>纵火</FireStartingSpree.beginLetterLabel>
   <FireStartingSpree.recoveryMessage>{0}停止纵火了。</FireStartingSpree.recoveryMessage>
   <FireStartingSpree.baseInspectLine>失控：纵火</FireStartingSpree.baseInspectLine>
 
   <GiveUpExit.label>放弃离开</GiveUpExit.label>
-  <GiveUpExit.beginLetterLabel>放弃</GiveUpExit.beginLetterLabel>
   <GiveUpExit.beginLetter>{0} 已经放弃并离开殖民地。</GiveUpExit.beginLetter>
+  <GiveUpExit.beginLetterLabel>放弃</GiveUpExit.beginLetterLabel>
   <GiveUpExit.recoveryMessage>{0}改变心意，并返回殖民地。</GiveUpExit.recoveryMessage>
   <GiveUpExit.baseInspectLine>失控：放弃离开</GiveUpExit.baseInspectLine>
 
@@ -31,30 +31,30 @@
   <BingingDrugMajor.baseInspectLine>失控：沉迷于{0}</BingingDrugMajor.baseInspectLine>
 
   <WanderPsychotic.label>茫然徘徊</WanderPsychotic.label>
-  <WanderPsychotic.recoveryMessage>{0}不再茫然徘徊。</WanderPsychotic.recoveryMessage>
-  <WanderPsychotic.beginLetterLabel>茫然徘徊</WanderPsychotic.beginLetterLabel>
   <WanderPsychotic.beginLetter>{0}已经失控，迷茫着四处徘徊。</WanderPsychotic.beginLetter>
+  <WanderPsychotic.beginLetterLabel>茫然徘徊</WanderPsychotic.beginLetterLabel>
+  <WanderPsychotic.recoveryMessage>{0}不再茫然徘徊。</WanderPsychotic.recoveryMessage>
   <WanderPsychotic.baseInspectLine>失控：迷茫徘徊</WanderPsychotic.baseInspectLine>
 
 
   <!-- Mental breaks: minor -->
 
   <BingingFood.label>暴饮暴食</BingingFood.label>
-  <BingingFood.beginLetterLabel>暴饮暴食</BingingFood.beginLetterLabel>
   <BingingFood.beginLetter>{0}正在暴饮暴食。</BingingFood.beginLetter>
+  <BingingFood.beginLetterLabel>暴饮暴食</BingingFood.beginLetterLabel>
   <BingingFood.recoveryMessage>{0}不再暴饮暴食了。</BingingFood.recoveryMessage>
   <BingingFood.baseInspectLine>失控：暴饮暴食</BingingFood.baseInspectLine>
 
   <WanderSad.label>悲伤徘徊</WanderSad.label>
-  <WanderSad.recoveryMessage>{0}不再悲伤徘徊。</WanderSad.recoveryMessage>
-  <WanderSad.beginLetterLabel>悲伤徘徊</WanderSad.beginLetterLabel>
   <WanderSad.beginLetter>{0}已经失控，悲伤着四处徘徊。</WanderSad.beginLetter>
+  <WanderSad.beginLetterLabel>悲伤徘徊</WanderSad.beginLetterLabel>
+  <WanderSad.recoveryMessage>{0}不再悲伤徘徊。</WanderSad.recoveryMessage>
   <WanderSad.baseInspectLine>失控：悲伤徘徊</WanderSad.baseInspectLine>
 
   <WanderOwnRoom.label>封闭自我</WanderOwnRoom.label>
-  <WanderOwnRoom.recoveryMessage>{0}不再把自己关在房间中。</WanderOwnRoom.recoveryMessage>
-  <WanderOwnRoom.beginLetterLabel>封闭自我</WanderOwnRoom.beginLetterLabel>
   <WanderOwnRoom.beginLetter>{0}把自己关在房间中。</WanderOwnRoom.beginLetter>
+  <WanderOwnRoom.beginLetterLabel>封闭自我</WanderOwnRoom.beginLetterLabel>
+  <WanderOwnRoom.recoveryMessage>{0}不再把自己关在房间中。</WanderOwnRoom.recoveryMessage>
   <WanderOwnRoom.baseInspectLine>失控：封闭自我</WanderOwnRoom.baseInspectLine>
 
 

DefInjected/MentalStateDef/MentalStates_Special.xml

@@ -4,26 +4,26 @@
   <!-- Special mental states not from mental breaks -->
 
   <WanderConfused.label>迷茫徘徊</WanderConfused.label>
-  <WanderConfused.beginLetterLabel>迷茫</WanderConfused.beginLetterLabel>
   <WanderConfused.beginLetter>{0}开始迷茫地四处徘徊。</WanderConfused.beginLetter>
+  <WanderConfused.beginLetterLabel>迷茫</WanderConfused.beginLetterLabel>
   <WanderConfused.recoveryMessage>{0}不再迷茫徘徊了。</WanderConfused.recoveryMessage>
   <WanderConfused.baseInspectLine>失控：迷茫徘徊</WanderConfused.baseInspectLine>
 
   <PanicFlee.label>仓皇逃窜</PanicFlee.label>
-  <PanicFlee.beginLetterLabel>逃窜</PanicFlee.beginLetterLabel>
   <PanicFlee.beginLetter>{0}开始仓皇逃窜。</PanicFlee.beginLetter>
+  <PanicFlee.beginLetterLabel>逃窜</PanicFlee.beginLetterLabel>
   <PanicFlee.recoveryMessage>{0}不再仓皇逃窜了。</PanicFlee.recoveryMessage>
   <PanicFlee.baseInspectLine>失控：仓皇逃窜</PanicFlee.baseInspectLine>
 
   <Manhunter.label>猎杀人类</Manhunter.label>
-  <Manhunter.beginLetterLabel>猎杀人类</Manhunter.beginLetterLabel>
   <Manhunter.beginLetter>{0}开始疯狂猎杀人类！</Manhunter.beginLetter>
+  <Manhunter.beginLetterLabel>猎杀人类</Manhunter.beginLetterLabel>
   <Manhunter.recoveryMessage>{0}不再猎杀人类了。</Manhunter.recoveryMessage>
   <Manhunter.baseInspectLine>疯狂：猎杀人类</Manhunter.baseInspectLine>
 
   <ManhunterPermanent.label>猎杀人类</ManhunterPermanent.label>
-  <ManhunterPermanent.beginLetterLabel>猎杀人类</ManhunterPermanent.beginLetterLabel>
   <ManhunterPermanent.beginLetter>{0}开始疯狂猎杀人类！</ManhunterPermanent.beginLetter>
+  <ManhunterPermanent.beginLetterLabel>猎杀人类</ManhunterPermanent.beginLetterLabel>
   <ManhunterPermanent.recoveryMessage>{0}不再猎杀人类了。</ManhunterPermanent.recoveryMessage>
   <ManhunterPermanent.baseInspectLine>疯狂：猎杀人类</ManhunterPermanent.baseInspectLine>
 

DefInjected/NeedDef/Ambrosia.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <!-- Ambrosia addiction -->
+
+  <Chemical_Ambrosia.label>ambrosia</Chemical_Ambrosia.label>
+  <Chemical_Ambrosia.description>Because of an ambrosia addiction, this person needs to regularly consume the drug to avoid withdrawal symptoms.</Chemical_Ambrosia.description>
+
+
+</LanguageData>

DefInjected/PawnKindDef/Races_Animal_Arid.xml

@@ -3,10 +3,6 @@
 
   <Muffalo.label>野牦牛</Muffalo.label>
   <Muffalo.labelPlural>野牦牛</Muffalo.labelPlural>
-  <Muffalo.labelMale>公野牦牛</Muffalo.labelMale>
-  <Muffalo.labelMalePlural>公野牦牛</Muffalo.labelMalePlural>
-  <Muffalo.labelFemale>母野牦牛</Muffalo.labelFemale>
-  <Muffalo.labelFemalePlural>母野牦牛</Muffalo.labelFemalePlural>
   <Muffalo.lifeStages.0.label>野牦牛犊</Muffalo.lifeStages.0.label>
   <Muffalo.lifeStages.0.labelPlural>野牦牛犊</Muffalo.lifeStages.0.labelPlural>
   <Muffalo.lifeStages.0.labelMale>野牦牛犊</Muffalo.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Muffalo.lifeStages.2.labelMalePlural>公野牦牛</Muffalo.lifeStages.2.labelMalePlural>
   <Muffalo.lifeStages.2.labelFemale>母野牦牛</Muffalo.lifeStages.2.labelFemale>
   <Muffalo.lifeStages.2.labelFemalePlural>母野牦牛</Muffalo.lifeStages.2.labelFemalePlural>
+  <Muffalo.labelMale>公野牦牛</Muffalo.labelMale>
+  <Muffalo.labelMalePlural>公野牦牛</Muffalo.labelMalePlural>
+  <Muffalo.labelFemale>母野牦牛</Muffalo.labelFemale>
+  <Muffalo.labelFemalePlural>母野牦牛</Muffalo.labelFemalePlural>
 
   <Gazelle.label>瞪羚</Gazelle.label>
   <Gazelle.labelPlural>瞪羚</Gazelle.labelPlural>
-  <Gazelle.labelMale>公瞪羚</Gazelle.labelMale>
-  <Gazelle.labelMalePlural>公瞪羚</Gazelle.labelMalePlural>
-  <Gazelle.labelFemale>母瞪羚</Gazelle.labelFemale>
-  <Gazelle.labelFemalePlural>母瞪羚</Gazelle.labelFemalePlural>
   <Gazelle.lifeStages.0.label>瞪羚幼崽</Gazelle.lifeStages.0.label>
   <Gazelle.lifeStages.0.labelPlural>瞪羚幼崽</Gazelle.lifeStages.0.labelPlural>
   <Gazelle.lifeStages.0.labelMale>瞪羚幼崽</Gazelle.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Gazelle.lifeStages.2.labelMalePlural>公瞪羚</Gazelle.lifeStages.2.labelMalePlural>
   <Gazelle.lifeStages.2.labelFemale>母瞪羚</Gazelle.lifeStages.2.labelFemale>
   <Gazelle.lifeStages.2.labelFemalePlural>母瞪羚</Gazelle.lifeStages.2.labelFemalePlural>
+  <Gazelle.labelMale>公瞪羚</Gazelle.labelMale>
+  <Gazelle.labelMalePlural>公瞪羚</Gazelle.labelMalePlural>
+  <Gazelle.labelFemale>母瞪羚</Gazelle.labelFemale>
+  <Gazelle.labelFemalePlural>母瞪羚</Gazelle.labelFemalePlural>
 
   <Iguana.label>鬣蜥</Iguana.label>
   <Iguana.labelPlural>鬣蜥</Iguana.labelPlural>
-  <Iguana.labelMale>公鬣蜥</Iguana.labelMale>
-  <Iguana.labelMalePlural>公鬣蜥</Iguana.labelMalePlural>
-  <Iguana.labelFemale>母鬣蜥</Iguana.labelFemale>
-  <Iguana.labelFemalePlural>母鬣蜥</Iguana.labelFemalePlural>
   <Iguana.lifeStages.0.label>鬣蜥幼崽</Iguana.lifeStages.0.label>
   <Iguana.lifeStages.0.labelPlural>鬣蜥幼崽</Iguana.lifeStages.0.labelPlural>
   <Iguana.lifeStages.0.labelMale>鬣蜥幼崽</Iguana.lifeStages.0.labelMale>
@@ -75,13 +71,13 @@
   <Iguana.lifeStages.2.labelMalePlural>公鬣蜥</Iguana.lifeStages.2.labelMalePlural>
   <Iguana.lifeStages.2.labelFemale>母鬣蜥</Iguana.lifeStages.2.labelFemale>
   <Iguana.lifeStages.2.labelFemalePlural>母鬣蜥</Iguana.lifeStages.2.labelFemalePlural>
+  <Iguana.labelMale>公鬣蜥</Iguana.labelMale>
+  <Iguana.labelMalePlural>公鬣蜥</Iguana.labelMalePlural>
+  <Iguana.labelFemale>母鬣蜥</Iguana.labelFemale>
+  <Iguana.labelFemalePlural>母鬣蜥</Iguana.labelFemalePlural>
 
   <Rhinoceros.label>犀牛</Rhinoceros.label>
   <Rhinoceros.labelPlural>犀牛</Rhinoceros.labelPlural>
-  <Rhinoceros.labelMale>公犀牛</Rhinoceros.labelMale>
-  <Rhinoceros.labelMalePlural>公犀牛</Rhinoceros.labelMalePlural>
-  <Rhinoceros.labelFemale>母犀牛</Rhinoceros.labelFemale>
-  <Rhinoceros.labelFemalePlural>母犀牛</Rhinoceros.labelFemalePlural>
   <Rhinoceros.lifeStages.0.label>犀牛幼崽</Rhinoceros.lifeStages.0.label>
   <Rhinoceros.lifeStages.0.labelPlural>犀牛幼崽</Rhinoceros.lifeStages.0.labelPlural>
   <Rhinoceros.lifeStages.0.labelMale>犀牛幼崽</Rhinoceros.lifeStages.0.labelMale>
@@ -100,13 +96,13 @@
   <Rhinoceros.lifeStages.2.labelMalePlural>公犀牛</Rhinoceros.lifeStages.2.labelMalePlural>
   <Rhinoceros.lifeStages.2.labelFemale>母犀牛</Rhinoceros.lifeStages.2.labelFemale>
   <Rhinoceros.lifeStages.2.labelFemalePlural>母犀牛</Rhinoceros.lifeStages.2.labelFemalePlural>
+  <Rhinoceros.labelMale>公犀牛</Rhinoceros.labelMale>
+  <Rhinoceros.labelMalePlural>公犀牛</Rhinoceros.labelMalePlural>
+  <Rhinoceros.labelFemale>母犀牛</Rhinoceros.labelFemale>
+  <Rhinoceros.labelFemalePlural>母犀牛</Rhinoceros.labelFemalePlural>
 
   <Dromedary.label>单峰骆驼</Dromedary.label>
   <Dromedary.labelPlural>单峰骆驼</Dromedary.labelPlural>
-  <Dromedary.labelMale>公单峰骆驼</Dromedary.labelMale>
-  <Dromedary.labelMalePlural>公单峰骆驼</Dromedary.labelMalePlural>
-  <Dromedary.labelFemale>母单峰骆驼</Dromedary.labelFemale>
-  <Dromedary.labelFemalePlural>母单峰骆驼</Dromedary.labelFemalePlural>
   <Dromedary.lifeStages.0.label>单峰骆驼幼崽</Dromedary.lifeStages.0.label>
   <Dromedary.lifeStages.0.labelPlural>单峰骆驼幼崽</Dromedary.lifeStages.0.labelPlural>
   <Dromedary.lifeStages.0.labelMale>单峰骆驼幼崽</Dromedary.lifeStages.0.labelMale>
@@ -125,6 +121,10 @@
   <Dromedary.lifeStages.2.labelMalePlural>公单峰骆驼</Dromedary.lifeStages.2.labelMalePlural>
   <Dromedary.lifeStages.2.labelFemale>母单峰骆驼</Dromedary.lifeStages.2.labelFemale>
   <Dromedary.lifeStages.2.labelFemalePlural>母单峰骆驼</Dromedary.lifeStages.2.labelFemalePlural>
+  <Dromedary.labelMale>公单峰骆驼</Dromedary.labelMale>
+  <Dromedary.labelMalePlural>公单峰骆驼</Dromedary.labelMalePlural>
+  <Dromedary.labelFemale>母单峰骆驼</Dromedary.labelFemale>
+  <Dromedary.labelFemalePlural>母单峰骆驼</Dromedary.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Bears.xml

@@ -3,10 +3,6 @@
 
   <GrizzlyBear.label>灰熊</GrizzlyBear.label>
   <GrizzlyBear.labelPlural>灰熊</GrizzlyBear.labelPlural>
-  <GrizzlyBear.labelMale>公灰熊</GrizzlyBear.labelMale>
-  <GrizzlyBear.labelMalePlural>公灰熊</GrizzlyBear.labelMalePlural>
-  <GrizzlyBear.labelFemale>母灰熊</GrizzlyBear.labelFemale>
-  <GrizzlyBear.labelFemalePlural>母灰熊</GrizzlyBear.labelFemalePlural>
   <GrizzlyBear.lifeStages.0.label>灰熊幼崽</GrizzlyBear.lifeStages.0.label>
   <GrizzlyBear.lifeStages.0.labelPlural>灰熊幼崽</GrizzlyBear.lifeStages.0.labelPlural>
   <GrizzlyBear.lifeStages.0.labelMale>灰熊幼崽</GrizzlyBear.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <GrizzlyBear.lifeStages.2.labelMalePlural>公灰熊</GrizzlyBear.lifeStages.2.labelMalePlural>
   <GrizzlyBear.lifeStages.2.labelFemale>母灰熊</GrizzlyBear.lifeStages.2.labelFemale>
   <GrizzlyBear.lifeStages.2.labelFemalePlural>母灰熊</GrizzlyBear.lifeStages.2.labelFemalePlural>
+  <GrizzlyBear.labelMale>公灰熊</GrizzlyBear.labelMale>
+  <GrizzlyBear.labelMalePlural>公灰熊</GrizzlyBear.labelMalePlural>
+  <GrizzlyBear.labelFemale>母灰熊</GrizzlyBear.labelFemale>
+  <GrizzlyBear.labelFemalePlural>母灰熊</GrizzlyBear.labelFemalePlural>
 
   <PolarBear.label>北极熊</PolarBear.label>
   <PolarBear.labelPlural>北极熊</PolarBear.labelPlural>
-  <PolarBear.labelMale>公北极熊</PolarBear.labelMale>
-  <PolarBear.labelMalePlural>公北极熊</PolarBear.labelMalePlural>
-  <PolarBear.labelFemale>母北极熊</PolarBear.labelFemale>
-  <PolarBear.labelFemalePlural>母北极熊</PolarBear.labelFemalePlural>
   <PolarBear.lifeStages.0.label>北极熊幼崽</PolarBear.lifeStages.0.label>
   <PolarBear.lifeStages.0.labelPlural>北极熊幼崽</PolarBear.lifeStages.0.labelPlural>
   <PolarBear.lifeStages.0.labelMale>北极熊幼崽</PolarBear.lifeStages.0.labelMale>
@@ -50,6 +46,10 @@
   <PolarBear.lifeStages.2.labelMalePlural>公北极熊</PolarBear.lifeStages.2.labelMalePlural>
   <PolarBear.lifeStages.2.labelFemale>母北极熊</PolarBear.lifeStages.2.labelFemale>
   <PolarBear.lifeStages.2.labelFemalePlural>母北极熊</PolarBear.lifeStages.2.labelFemalePlural>
+  <PolarBear.labelMale>公北极熊</PolarBear.labelMale>
+  <PolarBear.labelMalePlural>公北极熊</PolarBear.labelMalePlural>
+  <PolarBear.labelFemale>母北极熊</PolarBear.labelFemale>
+  <PolarBear.labelFemalePlural>母北极熊</PolarBear.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_BigCats.xml

@@ -3,10 +3,6 @@
 
   <Cougar.label>美洲狮</Cougar.label>
   <Cougar.labelPlural>美洲狮</Cougar.labelPlural>
-  <Cougar.labelMale>公美洲狮</Cougar.labelMale>
-  <Cougar.labelMalePlural>公美洲狮</Cougar.labelMalePlural>
-  <Cougar.labelFemale>母美洲狮</Cougar.labelFemale>
-  <Cougar.labelFemalePlural>母美洲狮</Cougar.labelFemalePlural>
   <Cougar.lifeStages.0.label>美洲狮幼崽</Cougar.lifeStages.0.label>
   <Cougar.lifeStages.0.labelPlural>美洲狮幼崽</Cougar.lifeStages.0.labelPlural>
   <Cougar.lifeStages.0.labelMale>美洲狮幼崽</Cougar.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Cougar.lifeStages.2.labelMalePlural>公美洲狮</Cougar.lifeStages.2.labelMalePlural>
   <Cougar.lifeStages.2.labelFemale>母美洲狮</Cougar.lifeStages.2.labelFemale>
   <Cougar.lifeStages.2.labelFemalePlural>母美洲狮</Cougar.lifeStages.2.labelFemalePlural>
+  <Cougar.labelMale>公美洲狮</Cougar.labelMale>
+  <Cougar.labelMalePlural>公美洲狮</Cougar.labelMalePlural>
+  <Cougar.labelFemale>母美洲狮</Cougar.labelFemale>
+  <Cougar.labelFemalePlural>母美洲狮</Cougar.labelFemalePlural>
 
   <Panther.label>黑豹</Panther.label>
   <Panther.labelPlural>黑豹</Panther.labelPlural>
-  <Panther.labelMale>公黑豹</Panther.labelMale>
-  <Panther.labelMalePlural>公黑豹</Panther.labelMalePlural>
-  <Panther.labelFemale>母黑豹</Panther.labelFemale>
-  <Panther.labelFemalePlural>母黑豹</Panther.labelFemalePlural>
   <Panther.lifeStages.0.label>黑豹幼崽</Panther.lifeStages.0.label>
   <Panther.lifeStages.0.labelPlural>黑豹幼崽</Panther.lifeStages.0.labelPlural>
   <Panther.lifeStages.0.labelMale>黑豹幼崽</Panther.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Panther.lifeStages.2.labelMalePlural>公黑豹</Panther.lifeStages.2.labelMalePlural>
   <Panther.lifeStages.2.labelFemale>母黑豹</Panther.lifeStages.2.labelFemale>
   <Panther.lifeStages.2.labelFemalePlural>母黑豹</Panther.lifeStages.2.labelFemalePlural>
+  <Panther.labelMale>公黑豹</Panther.labelMale>
+  <Panther.labelMalePlural>公黑豹</Panther.labelMalePlural>
+  <Panther.labelFemale>母黑豹</Panther.labelFemale>
+  <Panther.labelFemalePlural>母黑豹</Panther.labelFemalePlural>
 
   <Lynx.label>猞猁</Lynx.label>
   <Lynx.labelPlural>猞猁</Lynx.labelPlural>
-  <Lynx.labelMale>公猞猁</Lynx.labelMale>
-  <Lynx.labelMalePlural>公猞猁</Lynx.labelMalePlural>
-  <Lynx.labelFemale>母猞猁</Lynx.labelFemale>
-  <Lynx.labelFemalePlural>母猞猁</Lynx.labelFemalePlural>
   <Lynx.lifeStages.0.label>猞猁幼崽</Lynx.lifeStages.0.label>
   <Lynx.lifeStages.0.labelPlural>猞猁幼崽</Lynx.lifeStages.0.labelPlural>
   <Lynx.lifeStages.0.labelMale>猞猁幼崽</Lynx.lifeStages.0.labelMale>
@@ -75,6 +71,10 @@
   <Lynx.lifeStages.2.labelMalePlural>公猞猁</Lynx.lifeStages.2.labelMalePlural>
   <Lynx.lifeStages.2.labelFemale>母猞猁</Lynx.lifeStages.2.labelFemale>
   <Lynx.lifeStages.2.labelFemalePlural>母猞猁</Lynx.lifeStages.2.labelFemalePlural>
+  <Lynx.labelMale>公猞猁</Lynx.labelMale>
+  <Lynx.labelMalePlural>公猞猁</Lynx.labelMalePlural>
+  <Lynx.labelFemale>母猞猁</Lynx.labelFemale>
+  <Lynx.labelFemalePlural>母猞猁</Lynx.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Birds.xml

@@ -3,10 +3,6 @@
 
   <Cassowary.label>鹤鸵</Cassowary.label>
   <Cassowary.labelPlural>鹤鸵</Cassowary.labelPlural>
-  <Cassowary.labelMale>公鹤鸵</Cassowary.labelMale>
-  <Cassowary.labelMalePlural>公鹤鸵</Cassowary.labelMalePlural>
-  <Cassowary.labelFemale>母鹤鸵</Cassowary.labelFemale>
-  <Cassowary.labelFemalePlural>母鹤鸵</Cassowary.labelFemalePlural>
   <Cassowary.lifeStages.0.label>鹤鸵仔</Cassowary.lifeStages.0.label>
   <Cassowary.lifeStages.0.labelPlural>鹤鸵仔</Cassowary.lifeStages.0.labelPlural>
   <Cassowary.lifeStages.0.labelMale>鹤鸵仔</Cassowary.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Cassowary.lifeStages.2.labelMalePlural>公鹤鸵</Cassowary.lifeStages.2.labelMalePlural>
   <Cassowary.lifeStages.2.labelFemale>母鹤鸵</Cassowary.lifeStages.2.labelFemale>
   <Cassowary.lifeStages.2.labelFemalePlural>母鹤鸵</Cassowary.lifeStages.2.labelFemalePlural>
+  <Cassowary.labelMale>公鹤鸵</Cassowary.labelMale>
+  <Cassowary.labelMalePlural>公鹤鸵</Cassowary.labelMalePlural>
+  <Cassowary.labelFemale>母鹤鸵</Cassowary.labelFemale>
+  <Cassowary.labelFemalePlural>母鹤鸵</Cassowary.labelFemalePlural>
 
   <Emu.label>鸸鹋</Emu.label>
   <Emu.labelPlural>鸸鹋</Emu.labelPlural>
-  <Emu.labelMale>公鸸鹋</Emu.labelMale>
-  <Emu.labelMalePlural>公鸸鹋</Emu.labelMalePlural>
-  <Emu.labelFemale>母鸸鹋</Emu.labelFemale>
-  <Emu.labelFemalePlural>母鸸鹋</Emu.labelFemalePlural>
   <Emu.lifeStages.0.label>鸸鹋仔</Emu.lifeStages.0.label>
   <Emu.lifeStages.0.labelPlural>鸸鹋仔</Emu.lifeStages.0.labelPlural>
   <Emu.lifeStages.0.labelMale>鸸鹋仔</Emu.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Emu.lifeStages.2.labelMalePlural>公鸸鹋</Emu.lifeStages.2.labelMalePlural>
   <Emu.lifeStages.2.labelFemale>母鸸鹋</Emu.lifeStages.2.labelFemale>
   <Emu.lifeStages.2.labelFemalePlural>母鸸鹋</Emu.lifeStages.2.labelFemalePlural>
+  <Emu.labelMale>公鸸鹋</Emu.labelMale>
+  <Emu.labelMalePlural>公鸸鹋</Emu.labelMalePlural>
+  <Emu.labelFemale>母鸸鹋</Emu.labelFemale>
+  <Emu.labelFemalePlural>母鸸鹋</Emu.labelFemalePlural>
 
   <Ostrich.label>鸵鸟</Ostrich.label>
   <Ostrich.labelPlural>鸵鸟</Ostrich.labelPlural>
-  <Ostrich.labelMale>公鸵鸟</Ostrich.labelMale>
-  <Ostrich.labelMalePlural>公鸵鸟</Ostrich.labelMalePlural>
-  <Ostrich.labelFemale>母鸵鸟</Ostrich.labelFemale>
-  <Ostrich.labelFemalePlural>母鸵鸟</Ostrich.labelFemalePlural>
   <Ostrich.lifeStages.0.label>鸵鸟仔</Ostrich.lifeStages.0.label>
   <Ostrich.lifeStages.0.labelPlural>鸵鸟仔</Ostrich.lifeStages.0.labelPlural>
   <Ostrich.lifeStages.0.labelMale>鸵鸟仔</Ostrich.lifeStages.0.labelMale>
@@ -75,13 +71,13 @@
   <Ostrich.lifeStages.2.labelMalePlural>公鸵鸟</Ostrich.lifeStages.2.labelMalePlural>
   <Ostrich.lifeStages.2.labelFemale>母鸵鸟</Ostrich.lifeStages.2.labelFemale>
   <Ostrich.lifeStages.2.labelFemalePlural>母鸵鸟</Ostrich.lifeStages.2.labelFemalePlural>
+  <Ostrich.labelMale>公鸵鸟</Ostrich.labelMale>
+  <Ostrich.labelMalePlural>公鸵鸟</Ostrich.labelMalePlural>
+  <Ostrich.labelFemale>母鸵鸟</Ostrich.labelFemale>
+  <Ostrich.labelFemalePlural>母鸵鸟</Ostrich.labelFemalePlural>
 
   <Turkey.label>火鸡</Turkey.label>
   <Turkey.labelPlural>火鸡</Turkey.labelPlural>
-  <Turkey.labelMale>公火鸡</Turkey.labelMale>
-  <Turkey.labelMalePlural>公火鸡</Turkey.labelMalePlural>
-  <Turkey.labelFemale>母火鸡</Turkey.labelFemale>
-  <Turkey.labelFemalePlural>母火鸡</Turkey.labelFemalePlural>
   <Turkey.lifeStages.0.label>火鸡仔</Turkey.lifeStages.0.label>
   <Turkey.lifeStages.0.labelPlural>火鸡仔</Turkey.lifeStages.0.labelPlural>
   <Turkey.lifeStages.0.labelMale>火鸡仔</Turkey.lifeStages.0.labelMale>
@@ -100,6 +96,10 @@
   <Turkey.lifeStages.2.labelMalePlural>公火鸡</Turkey.lifeStages.2.labelMalePlural>
   <Turkey.lifeStages.2.labelFemale>母火鸡</Turkey.lifeStages.2.labelFemale>
   <Turkey.lifeStages.2.labelFemalePlural>母火鸡</Turkey.lifeStages.2.labelFemalePlural>
+  <Turkey.labelMale>公火鸡</Turkey.labelMale>
+  <Turkey.labelMalePlural>公火鸡</Turkey.labelMalePlural>
+  <Turkey.labelFemale>母火鸡</Turkey.labelFemale>
+  <Turkey.labelFemalePlural>母火鸡</Turkey.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Farm.xml

@@ -3,10 +3,6 @@
 
   <Chicken.label>鸡</Chicken.label>
   <Chicken.labelPlural>鸡</Chicken.labelPlural>
-  <Chicken.labelMale>公鸡</Chicken.labelMale>
-  <Chicken.labelMalePlural>公鸡</Chicken.labelMalePlural>
-  <Chicken.labelFemale>母鸡</Chicken.labelFemale>
-  <Chicken.labelFemalePlural>母鸡</Chicken.labelFemalePlural>
   <Chicken.lifeStages.0.label>鸡仔</Chicken.lifeStages.0.label>
   <Chicken.lifeStages.0.labelPlural>鸡仔</Chicken.lifeStages.0.labelPlural>
   <Chicken.lifeStages.0.labelMale>鸡仔</Chicken.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Chicken.lifeStages.2.labelMalePlural>公鸡</Chicken.lifeStages.2.labelMalePlural>
   <Chicken.lifeStages.2.labelFemale>母鸡</Chicken.lifeStages.2.labelFemale>
   <Chicken.lifeStages.2.labelFemalePlural>母鸡</Chicken.lifeStages.2.labelFemalePlural>
+  <Chicken.labelMale>公鸡</Chicken.labelMale>
+  <Chicken.labelMalePlural>公鸡</Chicken.labelMalePlural>
+  <Chicken.labelFemale>母鸡</Chicken.labelFemale>
+  <Chicken.labelFemalePlural>母鸡</Chicken.labelFemalePlural>
 
   <Pig.label>猪</Pig.label>
   <Pig.labelPlural>猪</Pig.labelPlural>
-  <Pig.labelMale>公猪</Pig.labelMale>
-  <Pig.labelMalePlural>公猪</Pig.labelMalePlural>
-  <Pig.labelFemale>母猪</Pig.labelFemale>
-  <Pig.labelFemalePlural>母猪</Pig.labelFemalePlural>
   <Pig.lifeStages.0.label>乳猪</Pig.lifeStages.0.label>
   <Pig.lifeStages.0.labelPlural>乳猪</Pig.lifeStages.0.labelPlural>
   <Pig.lifeStages.0.labelMale>乳猪</Pig.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Pig.lifeStages.2.labelMalePlural>公猪</Pig.lifeStages.2.labelMalePlural>
   <Pig.lifeStages.2.labelFemale>母猪</Pig.lifeStages.2.labelFemale>
   <Pig.lifeStages.2.labelFemalePlural>母猪</Pig.lifeStages.2.labelFemalePlural>
+  <Pig.labelMale>公猪</Pig.labelMale>
+  <Pig.labelMalePlural>公猪</Pig.labelMalePlural>
+  <Pig.labelFemale>母猪</Pig.labelFemale>
+  <Pig.labelFemalePlural>母猪</Pig.labelFemalePlural>
 
   <Cow.label>牛</Cow.label>
   <Cow.labelPlural>牛</Cow.labelPlural>
-  <Cow.labelMale>公牛</Cow.labelMale>
-  <Cow.labelMalePlural>公牛</Cow.labelMalePlural>
-  <Cow.labelFemale>母牛</Cow.labelFemale>
-  <Cow.labelFemalePlural>母牛</Cow.labelFemalePlural>
   <Cow.lifeStages.0.label>牛犊</Cow.lifeStages.0.label>
   <Cow.lifeStages.0.labelPlural>牛犊</Cow.lifeStages.0.labelPlural>
   <Cow.lifeStages.0.labelMale>牛犊</Cow.lifeStages.0.labelMale>
@@ -75,13 +71,13 @@
   <Cow.lifeStages.2.labelMalePlural>公牛</Cow.lifeStages.2.labelMalePlural>
   <Cow.lifeStages.2.labelFemale>母牛</Cow.lifeStages.2.labelFemale>
   <Cow.lifeStages.2.labelFemalePlural>母牛</Cow.lifeStages.2.labelFemalePlural>
+  <Cow.labelMale>公牛</Cow.labelMale>
+  <Cow.labelMalePlural>公牛</Cow.labelMalePlural>
+  <Cow.labelFemale>母牛</Cow.labelFemale>
+  <Cow.labelFemalePlural>母牛</Cow.labelFemalePlural>
 
   <Alpaca.label>羊驼</Alpaca.label>
   <Alpaca.labelPlural>羊驼</Alpaca.labelPlural>
-  <Alpaca.labelMale>公羊驼</Alpaca.labelMale>
-  <Alpaca.labelMalePlural>公羊驼</Alpaca.labelMalePlural>
-  <Alpaca.labelFemale>母羊驼</Alpaca.labelFemale>
-  <Alpaca.labelFemalePlural>母羊驼</Alpaca.labelFemalePlural>
   <Alpaca.lifeStages.0.label>羊驼幼崽</Alpaca.lifeStages.0.label>
   <Alpaca.lifeStages.0.labelPlural>羊驼幼崽</Alpaca.lifeStages.0.labelPlural>
   <Alpaca.lifeStages.0.labelMale>羊驼幼崽</Alpaca.lifeStages.0.labelMale>
@@ -100,6 +96,10 @@
   <Alpaca.lifeStages.2.labelMalePlural>公羊驼</Alpaca.lifeStages.2.labelMalePlural>
   <Alpaca.lifeStages.2.labelFemale>母羊驼</Alpaca.lifeStages.2.labelFemale>
   <Alpaca.lifeStages.2.labelFemalePlural>母羊驼</Alpaca.lifeStages.2.labelFemalePlural>
+  <Alpaca.labelMale>公羊驼</Alpaca.labelMale>
+  <Alpaca.labelMalePlural>公羊驼</Alpaca.labelMalePlural>
+  <Alpaca.labelFemale>母羊驼</Alpaca.labelFemale>
+  <Alpaca.labelFemalePlural>母羊驼</Alpaca.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Giant.xml

@@ -3,10 +3,6 @@
 
   <Elephant.label>象</Elephant.label>
   <Elephant.labelPlural>象</Elephant.labelPlural>
-  <Elephant.labelMale>公象</Elephant.labelMale>
-  <Elephant.labelMalePlural>公象</Elephant.labelMalePlural>
-  <Elephant.labelFemale>母象</Elephant.labelFemale>
-  <Elephant.labelFemalePlural>母象</Elephant.labelFemalePlural>
   <Elephant.lifeStages.0.label>象幼崽</Elephant.lifeStages.0.label>
   <Elephant.lifeStages.0.labelPlural>象幼崽</Elephant.lifeStages.0.labelPlural>
   <Elephant.lifeStages.0.labelMale>象幼崽</Elephant.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Elephant.lifeStages.2.labelMalePlural>公象</Elephant.lifeStages.2.labelMalePlural>
   <Elephant.lifeStages.2.labelFemale>母象</Elephant.lifeStages.2.labelFemale>
   <Elephant.lifeStages.2.labelFemalePlural>母象</Elephant.lifeStages.2.labelFemalePlural>
+  <Elephant.labelMale>公象</Elephant.labelMale>
+  <Elephant.labelMalePlural>公象</Elephant.labelMalePlural>
+  <Elephant.labelFemale>母象</Elephant.labelFemale>
+  <Elephant.labelFemalePlural>母象</Elephant.labelFemalePlural>
 
   <Megasloth.label>巨懒</Megasloth.label>
   <Megasloth.labelPlural>巨懒</Megasloth.labelPlural>
-  <Megasloth.labelMale>公巨懒</Megasloth.labelMale>
-  <Megasloth.labelMalePlural>公巨懒</Megasloth.labelMalePlural>
-  <Megasloth.labelFemale>母巨懒</Megasloth.labelFemale>
-  <Megasloth.labelFemalePlural>母巨懒</Megasloth.labelFemalePlural>
   <Megasloth.lifeStages.0.label>巨懒幼崽</Megasloth.lifeStages.0.label>
   <Megasloth.lifeStages.0.labelPlural>巨懒幼崽</Megasloth.lifeStages.0.labelPlural>
   <Megasloth.lifeStages.0.labelMale>巨懒幼崽</Megasloth.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Megasloth.lifeStages.2.labelMalePlural>公巨懒</Megasloth.lifeStages.2.labelMalePlural>
   <Megasloth.lifeStages.2.labelFemale>母巨懒</Megasloth.lifeStages.2.labelFemale>
   <Megasloth.lifeStages.2.labelFemalePlural>母巨懒</Megasloth.lifeStages.2.labelFemalePlural>
+  <Megasloth.labelMale>公巨懒</Megasloth.labelMale>
+  <Megasloth.labelMalePlural>公巨懒</Megasloth.labelMalePlural>
+  <Megasloth.labelFemale>母巨懒</Megasloth.labelFemale>
+  <Megasloth.labelFemalePlural>母巨懒</Megasloth.labelFemalePlural>
 
   <Thrumbo.label>敲击兽</Thrumbo.label>
   <Thrumbo.labelPlural>敲击兽</Thrumbo.labelPlural>
-  <Thrumbo.labelMale>公敲击兽</Thrumbo.labelMale>
-  <Thrumbo.labelMalePlural>公敲击兽</Thrumbo.labelMalePlural>
-  <Thrumbo.labelFemale>母敲击兽</Thrumbo.labelFemale>
-  <Thrumbo.labelFemalePlural>母敲击兽</Thrumbo.labelFemalePlural>
   <Thrumbo.lifeStages.0.label>敲击兽幼崽</Thrumbo.lifeStages.0.label>
   <Thrumbo.lifeStages.0.labelPlural>敲击兽幼崽</Thrumbo.lifeStages.0.labelPlural>
   <Thrumbo.lifeStages.0.labelMale>敲击兽幼崽</Thrumbo.lifeStages.0.labelMale>
@@ -75,6 +71,10 @@
   <Thrumbo.lifeStages.2.labelMalePlural>公敲击兽</Thrumbo.lifeStages.2.labelMalePlural>
   <Thrumbo.lifeStages.2.labelFemale>母敲击兽</Thrumbo.lifeStages.2.labelFemale>
   <Thrumbo.lifeStages.2.labelFemalePlural>母敲击兽</Thrumbo.lifeStages.2.labelFemalePlural>
+  <Thrumbo.labelMale>公敲击兽</Thrumbo.labelMale>
+  <Thrumbo.labelMalePlural>公敲击兽</Thrumbo.labelMalePlural>
+  <Thrumbo.labelFemale>母敲击兽</Thrumbo.labelFemale>
+  <Thrumbo.labelFemalePlural>母敲击兽</Thrumbo.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Hares.xml

@@ -3,10 +3,6 @@
 
   <Hare.label>野兔</Hare.label>
   <Hare.labelPlural>野兔</Hare.labelPlural>
-  <Hare.labelMale>公野兔</Hare.labelMale>
-  <Hare.labelMalePlural>公野兔</Hare.labelMalePlural>
-  <Hare.labelFemale>母野兔</Hare.labelFemale>
-  <Hare.labelFemalePlural>母野兔</Hare.labelFemalePlural>
   <Hare.lifeStages.0.label>野兔幼崽</Hare.lifeStages.0.label>
   <Hare.lifeStages.0.labelPlural>野兔幼崽</Hare.lifeStages.0.labelPlural>
   <Hare.lifeStages.0.labelMale>野兔幼崽</Hare.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Hare.lifeStages.2.labelMalePlural>公野兔</Hare.lifeStages.2.labelMalePlural>
   <Hare.lifeStages.2.labelFemale>母野兔</Hare.lifeStages.2.labelFemale>
   <Hare.lifeStages.2.labelFemalePlural>母野兔</Hare.lifeStages.2.labelFemalePlural>
+  <Hare.labelMale>公野兔</Hare.labelMale>
+  <Hare.labelMalePlural>公野兔</Hare.labelMalePlural>
+  <Hare.labelFemale>母野兔</Hare.labelFemale>
+  <Hare.labelFemalePlural>母野兔</Hare.labelFemalePlural>
 
   <Snowhare.label>雪兔</Snowhare.label>
   <Snowhare.labelPlural>雪兔</Snowhare.labelPlural>
-  <Snowhare.labelMale>公雪兔</Snowhare.labelMale>
-  <Snowhare.labelMalePlural>公雪兔</Snowhare.labelMalePlural>
-  <Snowhare.labelFemale>母雪兔</Snowhare.labelFemale>
-  <Snowhare.labelFemalePlural>母雪兔</Snowhare.labelFemalePlural>
   <Snowhare.lifeStages.0.label>雪兔幼崽</Snowhare.lifeStages.0.label>
   <Snowhare.lifeStages.0.labelPlural>雪兔幼崽</Snowhare.lifeStages.0.labelPlural>
   <Snowhare.lifeStages.0.labelMale>雪兔幼崽</Snowhare.lifeStages.0.labelMale>
@@ -50,6 +46,10 @@
   <Snowhare.lifeStages.2.labelMalePlural>公雪兔</Snowhare.lifeStages.2.labelMalePlural>
   <Snowhare.lifeStages.2.labelFemale>母雪兔</Snowhare.lifeStages.2.labelFemale>
   <Snowhare.lifeStages.2.labelFemalePlural>母雪兔</Snowhare.lifeStages.2.labelFemalePlural>
+  <Snowhare.labelMale>公雪兔</Snowhare.labelMale>
+  <Snowhare.labelMalePlural>公雪兔</Snowhare.labelMalePlural>
+  <Snowhare.labelFemale>母雪兔</Snowhare.labelFemale>
+  <Snowhare.labelFemalePlural>母雪兔</Snowhare.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Insect.xml

@@ -3,10 +3,6 @@
 
   <Megascarab.label>巨型甲虫</Megascarab.label>
   <Megascarab.labelPlural>巨型甲虫</Megascarab.labelPlural>
-  <Megascarab.labelMale>巨型甲虫</Megascarab.labelMale>
-  <Megascarab.labelMalePlural>巨型甲虫</Megascarab.labelMalePlural>
-  <Megascarab.labelFemale>巨型甲虫</Megascarab.labelFemale>
-  <Megascarab.labelFemalePlural>巨型甲虫</Megascarab.labelFemalePlural>
   <Megascarab.lifeStages.0.label>巨型甲虫幼体</Megascarab.lifeStages.0.label>
   <Megascarab.lifeStages.0.labelPlural>巨型甲虫幼体</Megascarab.lifeStages.0.labelPlural>
   <Megascarab.lifeStages.0.labelMale>巨型甲虫幼体</Megascarab.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Megascarab.lifeStages.2.labelMalePlural>巨型甲虫</Megascarab.lifeStages.2.labelMalePlural>
   <Megascarab.lifeStages.2.labelFemale>巨型甲虫</Megascarab.lifeStages.2.labelFemale>
   <Megascarab.lifeStages.2.labelFemalePlural>巨型甲虫</Megascarab.lifeStages.2.labelFemalePlural>
+  <Megascarab.labelMale>巨型甲虫</Megascarab.labelMale>
+  <Megascarab.labelMalePlural>巨型甲虫</Megascarab.labelMalePlural>
+  <Megascarab.labelFemale>巨型甲虫</Megascarab.labelFemale>
+  <Megascarab.labelFemalePlural>巨型甲虫</Megascarab.labelFemalePlural>
 
   <Spelopede.label>洞穴阔步虫</Spelopede.label>
   <Spelopede.labelPlural>洞穴阔步虫</Spelopede.labelPlural>
-  <Spelopede.labelMale>洞穴阔步虫</Spelopede.labelMale>
-  <Spelopede.labelMalePlural>洞穴阔步虫</Spelopede.labelMalePlural>
-  <Spelopede.labelFemale>洞穴阔步虫</Spelopede.labelFemale>
-  <Spelopede.labelFemalePlural>洞穴阔步虫</Spelopede.labelFemalePlural>
   <Spelopede.lifeStages.0.label>洞穴阔步虫幼体</Spelopede.lifeStages.0.label>
   <Spelopede.lifeStages.0.labelPlural>洞穴阔步虫幼体</Spelopede.lifeStages.0.labelPlural>
   <Spelopede.lifeStages.0.labelMale>洞穴阔步虫幼体</Spelopede.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Spelopede.lifeStages.2.labelMalePlural>洞穴阔步虫</Spelopede.lifeStages.2.labelMalePlural>
   <Spelopede.lifeStages.2.labelFemale>洞穴阔步虫</Spelopede.lifeStages.2.labelFemale>
   <Spelopede.lifeStages.2.labelFemalePlural>洞穴阔步虫</Spelopede.lifeStages.2.labelFemalePlural>
+  <Spelopede.labelMale>洞穴阔步虫</Spelopede.labelMale>
+  <Spelopede.labelMalePlural>洞穴阔步虫</Spelopede.labelMalePlural>
+  <Spelopede.labelFemale>洞穴阔步虫</Spelopede.labelFemale>
+  <Spelopede.labelFemalePlural>洞穴阔步虫</Spelopede.labelFemalePlural>
 
   <Megaspider.label>巨型蜘蛛</Megaspider.label>
   <Megaspider.labelPlural>巨型蜘蛛</Megaspider.labelPlural>
-  <Megaspider.labelMale>巨型蜘蛛</Megaspider.labelMale>
-  <Megaspider.labelMalePlural>巨型蜘蛛</Megaspider.labelMalePlural>
-  <Megaspider.labelFemale>巨型蜘蛛</Megaspider.labelFemale>
-  <Megaspider.labelFemalePlural>巨型蜘蛛</Megaspider.labelFemalePlural>
   <Megaspider.lifeStages.0.label>巨型蜘蛛幼体</Megaspider.lifeStages.0.label>
   <Megaspider.lifeStages.0.labelPlural>巨型蜘蛛幼体</Megaspider.lifeStages.0.labelPlural>
   <Megaspider.lifeStages.0.labelMale>巨型蜘蛛幼体</Megaspider.lifeStages.0.labelMale>
@@ -75,6 +71,10 @@
   <Megaspider.lifeStages.2.labelMalePlural>巨型蜘蛛</Megaspider.lifeStages.2.labelMalePlural>
   <Megaspider.lifeStages.2.labelFemale>巨型蜘蛛</Megaspider.lifeStages.2.labelFemale>
   <Megaspider.lifeStages.2.labelFemalePlural>巨型蜘蛛</Megaspider.lifeStages.2.labelFemalePlural>
+  <Megaspider.labelMale>巨型蜘蛛</Megaspider.labelMale>
+  <Megaspider.labelMalePlural>巨型蜘蛛</Megaspider.labelMalePlural>
+  <Megaspider.labelFemale>巨型蜘蛛</Megaspider.labelFemale>
+  <Megaspider.labelFemalePlural>巨型蜘蛛</Megaspider.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Pet.xml

@@ -3,10 +3,6 @@
 
   <YorkshireTerrier.label>约克夏犬</YorkshireTerrier.label>
   <YorkshireTerrier.labelPlural>约克夏犬</YorkshireTerrier.labelPlural>
-  <YorkshireTerrier.labelMale>公约克夏犬</YorkshireTerrier.labelMale>
-  <YorkshireTerrier.labelMalePlural>公约克夏犬</YorkshireTerrier.labelMalePlural>
-  <YorkshireTerrier.labelFemale>母约克夏犬</YorkshireTerrier.labelFemale>
-  <YorkshireTerrier.labelFemalePlural>母约克夏犬</YorkshireTerrier.labelFemalePlural>
   <YorkshireTerrier.lifeStages.0.label>约克夏犬幼崽</YorkshireTerrier.lifeStages.0.label>
   <YorkshireTerrier.lifeStages.0.labelPlural>约克夏犬幼崽</YorkshireTerrier.lifeStages.0.labelPlural>
   <YorkshireTerrier.lifeStages.0.labelMale>约克夏犬幼崽</YorkshireTerrier.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <YorkshireTerrier.lifeStages.2.labelMalePlural>公约克夏犬</YorkshireTerrier.lifeStages.2.labelMalePlural>
   <YorkshireTerrier.lifeStages.2.labelFemale>母约克夏犬</YorkshireTerrier.lifeStages.2.labelFemale>
   <YorkshireTerrier.lifeStages.2.labelFemalePlural>母约克夏犬</YorkshireTerrier.lifeStages.2.labelFemalePlural>
+  <YorkshireTerrier.labelMale>公约克夏犬</YorkshireTerrier.labelMale>
+  <YorkshireTerrier.labelMalePlural>公约克夏犬</YorkshireTerrier.labelMalePlural>
+  <YorkshireTerrier.labelFemale>母约克夏犬</YorkshireTerrier.labelFemale>
+  <YorkshireTerrier.labelFemalePlural>母约克夏犬</YorkshireTerrier.labelFemalePlural>
 
   <Husky.label>哈士奇犬</Husky.label>
   <Husky.labelPlural>哈士奇犬</Husky.labelPlural>
-  <Husky.labelMale>公哈士奇犬</Husky.labelMale>
-  <Husky.labelMalePlural>公哈士奇犬</Husky.labelMalePlural>
-  <Husky.labelFemale>母哈士奇犬</Husky.labelFemale>
-  <Husky.labelFemalePlural>母哈士奇犬</Husky.labelFemalePlural>
   <Husky.lifeStages.0.label>哈士奇犬幼崽</Husky.lifeStages.0.label>
   <Husky.lifeStages.0.labelPlural>哈士奇犬幼崽</Husky.lifeStages.0.labelPlural>
   <Husky.lifeStages.0.labelMale>哈士奇犬幼崽</Husky.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Husky.lifeStages.2.labelMalePlural>公哈士奇犬</Husky.lifeStages.2.labelMalePlural>
   <Husky.lifeStages.2.labelFemale>母哈士奇犬</Husky.lifeStages.2.labelFemale>
   <Husky.lifeStages.2.labelFemalePlural>母哈士奇犬</Husky.lifeStages.2.labelFemalePlural>
+  <Husky.labelMale>公哈士奇犬</Husky.labelMale>
+  <Husky.labelMalePlural>公哈士奇犬</Husky.labelMalePlural>
+  <Husky.labelFemale>母哈士奇犬</Husky.labelFemale>
+  <Husky.labelFemalePlural>母哈士奇犬</Husky.labelFemalePlural>
 
   <LabradorRetriever.label>拉布拉多犬</LabradorRetriever.label>
   <LabradorRetriever.labelPlural>拉布拉多犬</LabradorRetriever.labelPlural>
-  <LabradorRetriever.labelMale>公拉布拉多犬</LabradorRetriever.labelMale>
-  <LabradorRetriever.labelMalePlural>公拉布拉多犬</LabradorRetriever.labelMalePlural>
-  <LabradorRetriever.labelFemale>母拉布拉多犬</LabradorRetriever.labelFemale>
-  <LabradorRetriever.labelFemalePlural>母拉布拉多犬</LabradorRetriever.labelFemalePlural>
   <LabradorRetriever.lifeStages.0.label>拉布拉多犬幼崽</LabradorRetriever.lifeStages.0.label>
   <LabradorRetriever.lifeStages.0.labelPlural>拉布拉多犬幼崽</LabradorRetriever.lifeStages.0.labelPlural>
   <LabradorRetriever.lifeStages.0.labelMale>拉布拉多犬幼崽</LabradorRetriever.lifeStages.0.labelMale>
@@ -75,13 +71,13 @@
   <LabradorRetriever.lifeStages.2.labelMalePlural>公拉布拉多犬</LabradorRetriever.lifeStages.2.labelMalePlural>
   <LabradorRetriever.lifeStages.2.labelFemale>母拉布拉多犬</LabradorRetriever.lifeStages.2.labelFemale>
   <LabradorRetriever.lifeStages.2.labelFemalePlural>母拉布拉多犬</LabradorRetriever.lifeStages.2.labelFemalePlural>
+  <LabradorRetriever.labelMale>公拉布拉多犬</LabradorRetriever.labelMale>
+  <LabradorRetriever.labelMalePlural>公拉布拉多犬</LabradorRetriever.labelMalePlural>
+  <LabradorRetriever.labelFemale>母拉布拉多犬</LabradorRetriever.labelFemale>
+  <LabradorRetriever.labelFemalePlural>母拉布拉多犬</LabradorRetriever.labelFemalePlural>
 
   <Cat.label>猫</Cat.label>
   <Cat.labelPlural>猫</Cat.labelPlural>
-  <Cat.labelMale>公猫</Cat.labelMale>
-  <Cat.labelMalePlural>公猫</Cat.labelMalePlural>
-  <Cat.labelFemale>母猫</Cat.labelFemale>
-  <Cat.labelFemalePlural>母猫</Cat.labelFemalePlural>
   <Cat.lifeStages.0.label>小猫崽</Cat.lifeStages.0.label>
   <Cat.lifeStages.0.labelPlural>小猫崽</Cat.lifeStages.0.labelPlural>
   <Cat.lifeStages.0.labelMale>小猫崽</Cat.lifeStages.0.labelMale>
@@ -100,6 +96,10 @@
   <Cat.lifeStages.2.labelMalePlural>公猫</Cat.lifeStages.2.labelMalePlural>
   <Cat.lifeStages.2.labelFemale>母猫</Cat.lifeStages.2.labelFemale>
   <Cat.lifeStages.2.labelFemalePlural>母猫</Cat.lifeStages.2.labelFemalePlural>
+  <Cat.labelMale>公猫</Cat.labelMale>
+  <Cat.labelMalePlural>公猫</Cat.labelMalePlural>
+  <Cat.labelFemale>母猫</Cat.labelFemale>
+  <Cat.labelFemalePlural>母猫</Cat.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Rodentlike.xml

@@ -3,10 +3,6 @@
 
   <Squirrel.label>松鼠</Squirrel.label>
   <Squirrel.labelPlural>松鼠</Squirrel.labelPlural>
-  <Squirrel.labelMale>公松鼠</Squirrel.labelMale>
-  <Squirrel.labelMalePlural>公松鼠</Squirrel.labelMalePlural>
-  <Squirrel.labelFemale>母松鼠</Squirrel.labelFemale>
-  <Squirrel.labelFemalePlural>母松鼠</Squirrel.labelFemalePlural>
   <Squirrel.lifeStages.0.label>松鼠幼崽</Squirrel.lifeStages.0.label>
   <Squirrel.lifeStages.0.labelPlural>松鼠幼崽</Squirrel.lifeStages.0.labelPlural>
   <Squirrel.lifeStages.0.labelMale>松鼠幼崽</Squirrel.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Squirrel.lifeStages.2.labelMalePlural>公松鼠</Squirrel.lifeStages.2.labelMalePlural>
   <Squirrel.lifeStages.2.labelFemale>母松鼠</Squirrel.lifeStages.2.labelFemale>
   <Squirrel.lifeStages.2.labelFemalePlural>母松鼠</Squirrel.lifeStages.2.labelFemalePlural>
+  <Squirrel.labelMale>公松鼠</Squirrel.labelMale>
+  <Squirrel.labelMalePlural>公松鼠</Squirrel.labelMalePlural>
+  <Squirrel.labelFemale>母松鼠</Squirrel.labelFemale>
+  <Squirrel.labelFemalePlural>母松鼠</Squirrel.labelFemalePlural>
 
   <Alphabeaver.label>阿尔法海狸</Alphabeaver.label>
   <Alphabeaver.labelPlural>阿尔法海狸</Alphabeaver.labelPlural>
-  <Alphabeaver.labelMale>公阿尔法海狸</Alphabeaver.labelMale>
-  <Alphabeaver.labelMalePlural>公阿尔法海狸</Alphabeaver.labelMalePlural>
-  <Alphabeaver.labelFemale>母阿尔法海狸</Alphabeaver.labelFemale>
-  <Alphabeaver.labelFemalePlural>母阿尔法海狸</Alphabeaver.labelFemalePlural>
   <Alphabeaver.lifeStages.0.label>阿尔法海狸幼崽</Alphabeaver.lifeStages.0.label>
   <Alphabeaver.lifeStages.0.labelPlural>阿尔法海狸幼崽</Alphabeaver.lifeStages.0.labelPlural>
   <Alphabeaver.lifeStages.0.labelMale>阿尔法海狸幼崽</Alphabeaver.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Alphabeaver.lifeStages.2.labelMalePlural>公阿尔法海狸</Alphabeaver.lifeStages.2.labelMalePlural>
   <Alphabeaver.lifeStages.2.labelFemale>母阿尔法海狸</Alphabeaver.lifeStages.2.labelFemale>
   <Alphabeaver.lifeStages.2.labelFemalePlural>母阿尔法海狸</Alphabeaver.lifeStages.2.labelFemalePlural>
+  <Alphabeaver.labelMale>公阿尔法海狸</Alphabeaver.labelMale>
+  <Alphabeaver.labelMalePlural>公阿尔法海狸</Alphabeaver.labelMalePlural>
+  <Alphabeaver.labelFemale>母阿尔法海狸</Alphabeaver.labelFemale>
+  <Alphabeaver.labelFemalePlural>母阿尔法海狸</Alphabeaver.labelFemalePlural>
 
   <Capybara.label>水豚</Capybara.label>
   <Capybara.labelPlural>水豚</Capybara.labelPlural>
-  <Capybara.labelMale>公水豚</Capybara.labelMale>
-  <Capybara.labelMalePlural>公水豚</Capybara.labelMalePlural>
-  <Capybara.labelFemale>母水豚</Capybara.labelFemale>
-  <Capybara.labelFemalePlural>母水豚</Capybara.labelFemalePlural>
   <Capybara.lifeStages.0.label>水豚幼崽</Capybara.lifeStages.0.label>
   <Capybara.lifeStages.0.labelPlural>水豚幼崽</Capybara.lifeStages.0.labelPlural>
   <Capybara.lifeStages.0.labelMale>水豚幼崽</Capybara.lifeStages.0.labelMale>
@@ -75,13 +71,13 @@
   <Capybara.lifeStages.2.labelMalePlural>公水豚</Capybara.lifeStages.2.labelMalePlural>
   <Capybara.lifeStages.2.labelFemale>母水豚</Capybara.lifeStages.2.labelFemale>
   <Capybara.lifeStages.2.labelFemalePlural>母水豚</Capybara.lifeStages.2.labelFemalePlural>
+  <Capybara.labelMale>公水豚</Capybara.labelMale>
+  <Capybara.labelMalePlural>公水豚</Capybara.labelMalePlural>
+  <Capybara.labelFemale>母水豚</Capybara.labelFemale>
+  <Capybara.labelFemalePlural>母水豚</Capybara.labelFemalePlural>
 
   <Chinchilla.label>栗鼠</Chinchilla.label>
   <Chinchilla.labelPlural>栗鼠</Chinchilla.labelPlural>
-  <Chinchilla.labelMale>公栗鼠</Chinchilla.labelMale>
-  <Chinchilla.labelMalePlural>公栗鼠</Chinchilla.labelMalePlural>
-  <Chinchilla.labelFemale>母栗鼠</Chinchilla.labelFemale>
-  <Chinchilla.labelFemalePlural>母栗鼠</Chinchilla.labelFemalePlural>
   <Chinchilla.lifeStages.0.label>栗鼠幼崽</Chinchilla.lifeStages.0.label>
   <Chinchilla.lifeStages.0.labelPlural>栗鼠幼崽</Chinchilla.lifeStages.0.labelPlural>
   <Chinchilla.lifeStages.0.labelMale>栗鼠幼崽</Chinchilla.lifeStages.0.labelMale>
@@ -100,13 +96,13 @@
   <Chinchilla.lifeStages.2.labelMalePlural>公栗鼠</Chinchilla.lifeStages.2.labelMalePlural>
   <Chinchilla.lifeStages.2.labelFemale>母栗鼠</Chinchilla.lifeStages.2.labelFemale>
   <Chinchilla.lifeStages.2.labelFemalePlural>母栗鼠</Chinchilla.lifeStages.2.labelFemalePlural>
+  <Chinchilla.labelMale>公栗鼠</Chinchilla.labelMale>
+  <Chinchilla.labelMalePlural>公栗鼠</Chinchilla.labelMalePlural>
+  <Chinchilla.labelFemale>母栗鼠</Chinchilla.labelFemale>
+  <Chinchilla.labelFemalePlural>母栗鼠</Chinchilla.labelFemalePlural>
 
   <Boomrat.label>爆炸鼠</Boomrat.label>
   <Boomrat.labelPlural>爆炸鼠</Boomrat.labelPlural>
-  <Boomrat.labelMale>公爆炸鼠</Boomrat.labelMale>
-  <Boomrat.labelMalePlural>公爆炸鼠</Boomrat.labelMalePlural>
-  <Boomrat.labelFemale>母爆炸鼠</Boomrat.labelFemale>
-  <Boomrat.labelFemalePlural>母爆炸鼠</Boomrat.labelFemalePlural>
   <Boomrat.lifeStages.0.label>爆炸鼠幼崽</Boomrat.lifeStages.0.label>
   <Boomrat.lifeStages.0.labelPlural>爆炸鼠幼崽</Boomrat.lifeStages.0.labelPlural>
   <Boomrat.lifeStages.0.labelMale>爆炸鼠幼崽</Boomrat.lifeStages.0.labelMale>
@@ -125,13 +121,13 @@
   <Boomrat.lifeStages.2.labelMalePlural>公爆炸鼠</Boomrat.lifeStages.2.labelMalePlural>
   <Boomrat.lifeStages.2.labelFemale>母爆炸鼠</Boomrat.lifeStages.2.labelFemale>
   <Boomrat.lifeStages.2.labelFemalePlural>母爆炸鼠</Boomrat.lifeStages.2.labelFemalePlural>
+  <Boomrat.labelMale>公爆炸鼠</Boomrat.labelMale>
+  <Boomrat.labelMalePlural>公爆炸鼠</Boomrat.labelMalePlural>
+  <Boomrat.labelFemale>母爆炸鼠</Boomrat.labelFemale>
+  <Boomrat.labelFemalePlural>母爆炸鼠</Boomrat.labelFemalePlural>
 
   <Raccoon.label>浣熊</Raccoon.label>
   <Raccoon.labelPlural>浣熊</Raccoon.labelPlural>
-  <Raccoon.labelMale>公浣熊</Raccoon.labelMale>
-  <Raccoon.labelMalePlural>公浣熊</Raccoon.labelMalePlural>
-  <Raccoon.labelFemale>母浣熊</Raccoon.labelFemale>
-  <Raccoon.labelFemalePlural>母浣熊</Raccoon.labelFemalePlural>
   <Raccoon.lifeStages.0.label>浣熊幼崽</Raccoon.lifeStages.0.label>
   <Raccoon.lifeStages.0.labelPlural>浣熊幼崽</Raccoon.lifeStages.0.labelPlural>
   <Raccoon.lifeStages.0.labelMale>浣熊幼崽</Raccoon.lifeStages.0.labelMale>
@@ -150,13 +146,13 @@
   <Raccoon.lifeStages.2.labelMalePlural>公浣熊</Raccoon.lifeStages.2.labelMalePlural>
   <Raccoon.lifeStages.2.labelFemale>母浣熊</Raccoon.lifeStages.2.labelFemale>
   <Raccoon.lifeStages.2.labelFemalePlural>母浣熊</Raccoon.lifeStages.2.labelFemalePlural>
+  <Raccoon.labelMale>公浣熊</Raccoon.labelMale>
+  <Raccoon.labelMalePlural>公浣熊</Raccoon.labelMalePlural>
+  <Raccoon.labelFemale>母浣熊</Raccoon.labelFemale>
+  <Raccoon.labelFemalePlural>母浣熊</Raccoon.labelFemalePlural>
 
   <Rat.label>老鼠</Rat.label>
   <Rat.labelPlural>老鼠</Rat.labelPlural>
-  <Rat.labelMale>公老鼠</Rat.labelMale>
-  <Rat.labelMalePlural>公老鼠</Rat.labelMalePlural>
-  <Rat.labelFemale>母老鼠</Rat.labelFemale>
-  <Rat.labelFemalePlural>母老鼠</Rat.labelFemalePlural>
   <Rat.lifeStages.0.label>老鼠幼崽</Rat.lifeStages.0.label>
   <Rat.lifeStages.0.labelPlural>老鼠幼崽</Rat.lifeStages.0.labelPlural>
   <Rat.lifeStages.0.labelMale>老鼠幼崽</Rat.lifeStages.0.labelMale>
@@ -175,6 +171,10 @@
   <Rat.lifeStages.2.labelMalePlural>公老鼠</Rat.lifeStages.2.labelMalePlural>
   <Rat.lifeStages.2.labelFemale>母老鼠</Rat.lifeStages.2.labelFemale>
   <Rat.lifeStages.2.labelFemalePlural>母老鼠</Rat.lifeStages.2.labelFemalePlural>
+  <Rat.labelMale>公老鼠</Rat.labelMale>
+  <Rat.labelMalePlural>公老鼠</Rat.labelMalePlural>
+  <Rat.labelFemale>母老鼠</Rat.labelFemale>
+  <Rat.labelFemalePlural>母老鼠</Rat.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Temperate.xml

@@ -3,10 +3,6 @@
 
   <Deer.label>鹿</Deer.label>
   <Deer.labelPlural>鹿</Deer.labelPlural>
-  <Deer.labelMale>公鹿</Deer.labelMale>
-  <Deer.labelMalePlural>公鹿</Deer.labelMalePlural>
-  <Deer.labelFemale>母鹿</Deer.labelFemale>
-  <Deer.labelFemalePlural>母鹿</Deer.labelFemalePlural>
   <Deer.lifeStages.0.label>鹿幼崽</Deer.lifeStages.0.label>
   <Deer.lifeStages.0.labelPlural>鹿幼崽</Deer.lifeStages.0.labelPlural>
   <Deer.lifeStages.0.labelMale>鹿幼崽</Deer.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Deer.lifeStages.2.labelMalePlural>公鹿</Deer.lifeStages.2.labelMalePlural>
   <Deer.lifeStages.2.labelFemale>母鹿</Deer.lifeStages.2.labelFemale>
   <Deer.lifeStages.2.labelFemalePlural>母鹿</Deer.lifeStages.2.labelFemalePlural>
+  <Deer.labelMale>公鹿</Deer.labelMale>
+  <Deer.labelMalePlural>公鹿</Deer.labelMalePlural>
+  <Deer.labelFemale>母鹿</Deer.labelFemale>
+  <Deer.labelFemalePlural>母鹿</Deer.labelFemalePlural>
 
   <Ibex.label>野山羊</Ibex.label>
   <Ibex.labelPlural>野山羊</Ibex.labelPlural>
-  <Ibex.labelMale>公野山羊</Ibex.labelMale>
-  <Ibex.labelMalePlural>公野山羊</Ibex.labelMalePlural>
-  <Ibex.labelFemale>母野山羊</Ibex.labelFemale>
-  <Ibex.labelFemalePlural>母野山羊</Ibex.labelFemalePlural>
   <Ibex.lifeStages.0.label>野山羊羔</Ibex.lifeStages.0.label>
   <Ibex.lifeStages.0.labelPlural>野山羊羔</Ibex.lifeStages.0.labelPlural>
   <Ibex.lifeStages.0.labelMale>野山羊羔</Ibex.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Ibex.lifeStages.2.labelMalePlural>公野山羊</Ibex.lifeStages.2.labelMalePlural>
   <Ibex.lifeStages.2.labelFemale>母野山羊</Ibex.lifeStages.2.labelFemale>
   <Ibex.lifeStages.2.labelFemalePlural>母野山羊</Ibex.lifeStages.2.labelFemalePlural>
+  <Ibex.labelMale>公野山羊</Ibex.labelMale>
+  <Ibex.labelMalePlural>公野山羊</Ibex.labelMalePlural>
+  <Ibex.labelFemale>母野山羊</Ibex.labelFemale>
+  <Ibex.labelFemalePlural>母野山羊</Ibex.labelFemalePlural>
 
   <Elk.label>驼鹿</Elk.label>
   <Elk.labelPlural>驼鹿</Elk.labelPlural>
-  <Elk.labelMale>公驼鹿</Elk.labelMale>
-  <Elk.labelMalePlural>公驼鹿</Elk.labelMalePlural>
-  <Elk.labelFemale>母驼鹿</Elk.labelFemale>
-  <Elk.labelFemalePlural>母驼鹿</Elk.labelFemalePlural>
   <Elk.lifeStages.0.label>驼鹿幼崽</Elk.lifeStages.0.label>
   <Elk.lifeStages.0.labelPlural>驼鹿幼崽</Elk.lifeStages.0.labelPlural>
   <Elk.lifeStages.0.labelMale>驼鹿幼崽</Elk.lifeStages.0.labelMale>
@@ -75,13 +71,13 @@
   <Elk.lifeStages.2.labelMalePlural>公驼鹿</Elk.lifeStages.2.labelMalePlural>
   <Elk.lifeStages.2.labelFemale>母驼鹿</Elk.lifeStages.2.labelFemale>
   <Elk.lifeStages.2.labelFemalePlural>母驼鹿</Elk.lifeStages.2.labelFemalePlural>
+  <Elk.labelMale>公驼鹿</Elk.labelMale>
+  <Elk.labelMalePlural>公驼鹿</Elk.labelMalePlural>
+  <Elk.labelFemale>母驼鹿</Elk.labelFemale>
+  <Elk.labelFemalePlural>母驼鹿</Elk.labelFemalePlural>
 
   <Caribou.label>驯鹿</Caribou.label>
   <Caribou.labelPlural>驯鹿</Caribou.labelPlural>
-  <Caribou.labelMale>公驯鹿</Caribou.labelMale>
-  <Caribou.labelMalePlural>公驯鹿</Caribou.labelMalePlural>
-  <Caribou.labelFemale>母驯鹿</Caribou.labelFemale>
-  <Caribou.labelFemalePlural>母驯鹿</Caribou.labelFemalePlural>
   <Caribou.lifeStages.0.label>驯鹿幼崽</Caribou.lifeStages.0.label>
   <Caribou.lifeStages.0.labelPlural>驯鹿幼崽</Caribou.lifeStages.0.labelPlural>
   <Caribou.lifeStages.0.labelMale>驯鹿幼崽</Caribou.lifeStages.0.labelMale>
@@ -100,13 +96,13 @@
   <Caribou.lifeStages.2.labelMalePlural>公驯鹿</Caribou.lifeStages.2.labelMalePlural>
   <Caribou.lifeStages.2.labelFemale>母驯鹿</Caribou.lifeStages.2.labelFemale>
   <Caribou.lifeStages.2.labelFemalePlural>母驯鹿</Caribou.lifeStages.2.labelFemalePlural>
+  <Caribou.labelMale>公驯鹿</Caribou.labelMale>
+  <Caribou.labelMalePlural>公驯鹿</Caribou.labelMalePlural>
+  <Caribou.labelFemale>母驯鹿</Caribou.labelFemale>
+  <Caribou.labelFemalePlural>母驯鹿</Caribou.labelFemalePlural>
 
   <WildBoar.label>野猪</WildBoar.label>
   <WildBoar.labelPlural>野猪</WildBoar.labelPlural>
-  <WildBoar.labelMale>公野猪</WildBoar.labelMale>
-  <WildBoar.labelMalePlural>公野猪</WildBoar.labelMalePlural>
-  <WildBoar.labelFemale>母野猪</WildBoar.labelFemale>
-  <WildBoar.labelFemalePlural>母野猪</WildBoar.labelFemalePlural>
   <WildBoar.lifeStages.0.label>野猪幼崽</WildBoar.lifeStages.0.label>
   <WildBoar.lifeStages.0.labelPlural>野猪幼崽</WildBoar.lifeStages.0.labelPlural>
   <WildBoar.lifeStages.0.labelMale>野猪幼崽</WildBoar.lifeStages.0.labelMale>
@@ -125,13 +121,13 @@
   <WildBoar.lifeStages.2.labelMalePlural>公野猪</WildBoar.lifeStages.2.labelMalePlural>
   <WildBoar.lifeStages.2.labelFemale>母野猪</WildBoar.lifeStages.2.labelFemale>
   <WildBoar.lifeStages.2.labelFemalePlural>母野猪</WildBoar.lifeStages.2.labelFemalePlural>
+  <WildBoar.labelMale>公野猪</WildBoar.labelMale>
+  <WildBoar.labelMalePlural>公野猪</WildBoar.labelMalePlural>
+  <WildBoar.labelFemale>母野猪</WildBoar.labelFemale>
+  <WildBoar.labelFemalePlural>母野猪</WildBoar.labelFemalePlural>
 
   <Tortoise.label>乌龟</Tortoise.label>
   <Tortoise.labelPlural>乌龟</Tortoise.labelPlural>
-  <Tortoise.labelMale>公乌龟</Tortoise.labelMale>
-  <Tortoise.labelMalePlural>公乌龟</Tortoise.labelMalePlural>
-  <Tortoise.labelFemale>母乌龟</Tortoise.labelFemale>
-  <Tortoise.labelFemalePlural>母乌龟</Tortoise.labelFemalePlural>
   <Tortoise.lifeStages.0.label>乌龟幼崽</Tortoise.lifeStages.0.label>
   <Tortoise.lifeStages.0.labelPlural>乌龟幼崽</Tortoise.lifeStages.0.labelPlural>
   <Tortoise.lifeStages.0.labelMale>乌龟幼崽</Tortoise.lifeStages.0.labelMale>
@@ -150,6 +146,10 @@
   <Tortoise.lifeStages.2.labelMalePlural>公乌龟</Tortoise.lifeStages.2.labelMalePlural>
   <Tortoise.lifeStages.2.labelFemale>母乌龟</Tortoise.lifeStages.2.labelFemale>
   <Tortoise.lifeStages.2.labelFemalePlural>母乌龟</Tortoise.lifeStages.2.labelFemalePlural>
+  <Tortoise.labelMale>公乌龟</Tortoise.labelMale>
+  <Tortoise.labelMalePlural>公乌龟</Tortoise.labelMalePlural>
+  <Tortoise.labelFemale>母乌龟</Tortoise.labelFemale>
+  <Tortoise.labelFemalePlural>母乌龟</Tortoise.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_Tropical.xml

@@ -3,10 +3,6 @@
 
   <Cobra.label>眼镜蛇</Cobra.label>
   <Cobra.labelPlural>眼镜蛇</Cobra.labelPlural>
-  <Cobra.labelMale>公眼镜蛇</Cobra.labelMale>
-  <Cobra.labelMalePlural>公眼镜蛇</Cobra.labelMalePlural>
-  <Cobra.labelFemale>母眼镜蛇</Cobra.labelFemale>
-  <Cobra.labelFemalePlural>母眼镜蛇</Cobra.labelFemalePlural>
   <Cobra.lifeStages.0.label>眼镜蛇幼崽</Cobra.lifeStages.0.label>
   <Cobra.lifeStages.0.labelPlural>眼镜蛇幼崽</Cobra.lifeStages.0.labelPlural>
   <Cobra.lifeStages.0.labelMale>眼镜蛇幼崽</Cobra.lifeStages.0.labelMale>
@@ -25,13 +21,13 @@
   <Cobra.lifeStages.2.labelMalePlural>公眼镜蛇</Cobra.lifeStages.2.labelMalePlural>
   <Cobra.lifeStages.2.labelFemale>母眼镜蛇</Cobra.lifeStages.2.labelFemale>
   <Cobra.lifeStages.2.labelFemalePlural>母眼镜蛇</Cobra.lifeStages.2.labelFemalePlural>
+  <Cobra.labelMale>公眼镜蛇</Cobra.labelMale>
+  <Cobra.labelMalePlural>公眼镜蛇</Cobra.labelMalePlural>
+  <Cobra.labelFemale>母眼镜蛇</Cobra.labelFemale>
+  <Cobra.labelFemalePlural>母眼镜蛇</Cobra.labelFemalePlural>
 
   <Monkey.label>猴</Monkey.label>
   <Monkey.labelPlural>猴</Monkey.labelPlural>
-  <Monkey.labelMale>公猴</Monkey.labelMale>
-  <Monkey.labelMalePlural>公猴</Monkey.labelMalePlural>
-  <Monkey.labelFemale>母猴</Monkey.labelFemale>
-  <Monkey.labelFemalePlural>母猴</Monkey.labelFemalePlural>
   <Monkey.lifeStages.0.label>幼猴</Monkey.lifeStages.0.label>
   <Monkey.lifeStages.0.labelPlural>幼猴</Monkey.lifeStages.0.labelPlural>
   <Monkey.lifeStages.0.labelMale>幼猴</Monkey.lifeStages.0.labelMale>
@@ -50,13 +46,13 @@
   <Monkey.lifeStages.2.labelMalePlural>公猴</Monkey.lifeStages.2.labelMalePlural>
   <Monkey.lifeStages.2.labelFemale>母猴</Monkey.lifeStages.2.labelFemale>
   <Monkey.lifeStages.2.labelFemalePlural>母猴</Monkey.lifeStages.2.labelFemalePlural>
+  <Monkey.labelMale>公猴</Monkey.labelMale>
+  <Monkey.labelMalePlural>公猴</Monkey.labelMalePlural>
+  <Monkey.labelFemale>母猴</Monkey.labelFemale>
+  <Monkey.labelFemalePlural>母猴</Monkey.labelFemalePlural>
 
   <Boomalope.label>爆炸羊</Boomalope.label>
   <Boomalope.labelPlural>爆炸羊</Boomalope.labelPlural>
-  <Boomalope.labelMale>公爆炸羊</Boomalope.labelMale>
-  <Boomalope.labelMalePlural>公爆炸羊</Boomalope.labelMalePlural>
-  <Boomalope.labelFemale>母爆炸羊</Boomalope.labelFemale>
-  <Boomalope.labelFemalePlural>母爆炸羊</Boomalope.labelFemalePlural>
   <Boomalope.lifeStages.0.label>爆炸羊幼崽</Boomalope.lifeStages.0.label>
   <Boomalope.lifeStages.0.labelPlural>爆炸羊幼崽</Boomalope.lifeStages.0.labelPlural>
   <Boomalope.lifeStages.0.labelMale>爆炸羊幼崽</Boomalope.lifeStages.0.labelMale>
@@ -75,6 +71,10 @@
   <Boomalope.lifeStages.2.labelMalePlural>公爆炸羊</Boomalope.lifeStages.2.labelMalePlural>
   <Boomalope.lifeStages.2.labelFemale>母爆炸羊</Boomalope.lifeStages.2.labelFemale>
   <Boomalope.lifeStages.2.labelFemalePlural>母爆炸羊</Boomalope.lifeStages.2.labelFemalePlural>
+  <Boomalope.labelMale>公爆炸羊</Boomalope.labelMale>
+  <Boomalope.labelMalePlural>公爆炸羊</Boomalope.labelMalePlural>
+  <Boomalope.labelFemale>母爆炸羊</Boomalope.labelFemale>
+  <Boomalope.labelFemalePlural>母爆炸羊</Boomalope.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/PawnKindDef/Races_Animal_WildCanines.xml

@@ -5,10 +5,6 @@
 
   <Warg.label>座狼</Warg.label>
   <Warg.labelPlural>座狼</Warg.labelPlural>
-  <Warg.labelMale>公座狼</Warg.labelMale>
-  <Warg.labelMalePlural>公座狼</Warg.labelMalePlural>
-  <Warg.labelFemale>母座狼</Warg.labelFemale>
-  <Warg.labelFemalePlural>母座狼</Warg.labelFemalePlural>
   <Warg.lifeStages.0.label>座狼幼崽</Warg.lifeStages.0.label>
   <Warg.lifeStages.0.labelPlural>座狼幼崽</Warg.lifeStages.0.labelPlural>
   <Warg.lifeStages.0.labelMale>座狼幼崽</Warg.lifeStages.0.labelMale>
@@ -27,16 +23,16 @@
   <Warg.lifeStages.2.labelMalePlural>公座狼</Warg.lifeStages.2.labelMalePlural>
   <Warg.lifeStages.2.labelFemale>母座狼</Warg.lifeStages.2.labelFemale>
   <Warg.lifeStages.2.labelFemalePlural>母座狼</Warg.lifeStages.2.labelFemalePlural>
+  <Warg.labelMale>公座狼</Warg.labelMale>
+  <Warg.labelMalePlural>公座狼</Warg.labelMalePlural>
+  <Warg.labelFemale>母座狼</Warg.labelFemale>
+  <Warg.labelFemalePlural>母座狼</Warg.labelFemalePlural>
 
 
   <!-- Wolves -->
 
   <WolfTimber.label>森林狼</WolfTimber.label>
   <WolfTimber.labelPlural>森林狼</WolfTimber.labelPlural>
-  <WolfTimber.labelMale>公森林狼</WolfTimber.labelMale>
-  <WolfTimber.labelMalePlural>公森林狼</WolfTimber.labelMalePlural>
-  <WolfTimber.labelFemale>母森林狼</WolfTimber.labelFemale>
-  <WolfTimber.labelFemalePlural>母森林狼</WolfTimber.labelFemalePlural>
   <WolfTimber.lifeStages.0.label>森林狼幼崽</WolfTimber.lifeStages.0.label>
   <WolfTimber.lifeStages.0.labelPlural>森林狼幼崽</WolfTimber.lifeStages.0.labelPlural>
   <WolfTimber.lifeStages.0.labelMale>森林狼幼崽</WolfTimber.lifeStages.0.labelMale>
@@ -55,13 +51,13 @@
   <WolfTimber.lifeStages.2.labelMalePlural>公森林狼</WolfTimber.lifeStages.2.labelMalePlural>
   <WolfTimber.lifeStages.2.labelFemale>母森林狼</WolfTimber.lifeStages.2.labelFemale>
   <WolfTimber.lifeStages.2.labelFemalePlural>母森林狼</WolfTimber.lifeStages.2.labelFemalePlural>
+  <WolfTimber.labelMale>公森林狼</WolfTimber.labelMale>
+  <WolfTimber.labelMalePlural>公森林狼</WolfTimber.labelMalePlural>
+  <WolfTimber.labelFemale>母森林狼</WolfTimber.labelFemale>
+  <WolfTimber.labelFemalePlural>母森林狼</WolfTimber.labelFemalePlural>
 
   <WolfArctic.label>北极狼</WolfArctic.label>
   <WolfArctic.labelPlural>北极狼</WolfArctic.labelPlural>
-  <WolfArctic.labelMale>公北极狼</WolfArctic.labelMale>
-  <WolfArctic.labelMalePlural>公北极狼</WolfArctic.labelMalePlural>
-  <WolfArctic.labelFemale>母北极狼</WolfArctic.labelFemale>
-  <WolfArctic.labelFemalePlural>母北极狼</WolfArctic.labelFemalePlural>
   <WolfArctic.lifeStages.0.label>北极狼幼崽</WolfArctic.lifeStages.0.label>
   <WolfArctic.lifeStages.0.labelPlural>北极狼幼崽</WolfArctic.lifeStages.0.labelPlural>
   <WolfArctic.lifeStages.0.labelMale>北极狼幼崽</WolfArctic.lifeStages.0.labelMale>
@@ -80,16 +76,16 @@
   <WolfArctic.lifeStages.2.labelMalePlural>公北极狼</WolfArctic.lifeStages.2.labelMalePlural>
   <WolfArctic.lifeStages.2.labelFemale>母北极狼</WolfArctic.lifeStages.2.labelFemale>
   <WolfArctic.lifeStages.2.labelFemalePlural>母北极狼</WolfArctic.lifeStages.2.labelFemalePlural>
+  <WolfArctic.labelMale>公北极狼</WolfArctic.labelMale>
+  <WolfArctic.labelMalePlural>公北极狼</WolfArctic.labelMalePlural>
+  <WolfArctic.labelFemale>母北极狼</WolfArctic.labelFemale>
+  <WolfArctic.labelFemalePlural>母北极狼</WolfArctic.labelFemalePlural>
 
 
   <!-- Fox fennec -->
 
   <FoxFennec.label>耳廓狐</FoxFennec.label>
   <FoxFennec.labelPlural>耳廓狐</FoxFennec.labelPlural>
-  <FoxFennec.labelMale>公耳廓狐</FoxFennec.labelMale>
-  <FoxFennec.labelMalePlural>公耳廓狐</FoxFennec.labelMalePlural>
-  <FoxFennec.labelFemale>母耳廓狐</FoxFennec.labelFemale>
-  <FoxFennec.labelFemalePlural>母耳廓狐</FoxFennec.labelFemalePlural>
   <FoxFennec.lifeStages.0.label>耳廓狐幼崽</FoxFennec.lifeStages.0.label>
   <FoxFennec.lifeStages.0.labelPlural>耳廓狐幼崽</FoxFennec.lifeStages.0.labelPlural>
   <FoxFennec.lifeStages.0.labelMale>耳廓狐幼崽</FoxFennec.lifeStages.0.labelMale>
@@ -108,16 +104,16 @@
   <FoxFennec.lifeStages.2.labelMalePlural>公耳廓狐</FoxFennec.lifeStages.2.labelMalePlural>
   <FoxFennec.lifeStages.2.labelFemale>母耳廓狐</FoxFennec.lifeStages.2.labelFemale>
   <FoxFennec.lifeStages.2.labelFemalePlural>母耳廓狐</FoxFennec.lifeStages.2.labelFemalePlural>
+  <FoxFennec.labelMale>公耳廓狐</FoxFennec.labelMale>
+  <FoxFennec.labelMalePlural>公耳廓狐</FoxFennec.labelMalePlural>
+  <FoxFennec.labelFemale>母耳廓狐</FoxFennec.labelFemale>
+  <FoxFennec.labelFemalePlural>母耳廓狐</FoxFennec.labelFemalePlural>
 
 
   <!-- Fox red -->
 
   <FoxRed.label>赤狐</FoxRed.label>
   <FoxRed.labelPlural>赤狐</FoxRed.labelPlural>
-  <FoxRed.labelMale>公赤狐</FoxRed.labelMale>
-  <FoxRed.labelMalePlural>公赤狐</FoxRed.labelMalePlural>
-  <FoxRed.labelFemale>母赤狐</FoxRed.labelFemale>
-  <FoxRed.labelFemalePlural>母赤狐</FoxRed.labelFemalePlural>
   <FoxRed.lifeStages.0.label>赤狐幼崽</FoxRed.lifeStages.0.label>
   <FoxRed.lifeStages.0.labelPlural>赤狐幼崽</FoxRed.lifeStages.0.labelPlural>
   <FoxRed.lifeStages.0.labelMale>赤狐幼崽</FoxRed.lifeStages.0.labelMale>
@@ -136,16 +132,16 @@
   <FoxRed.lifeStages.2.labelMalePlural>公赤狐</FoxRed.lifeStages.2.labelMalePlural>
   <FoxRed.lifeStages.2.labelFemale>母赤狐</FoxRed.lifeStages.2.labelFemale>
   <FoxRed.lifeStages.2.labelFemalePlural>母赤狐</FoxRed.lifeStages.2.labelFemalePlural>
+  <FoxRed.labelMale>公赤狐</FoxRed.labelMale>
+  <FoxRed.labelMalePlural>公赤狐</FoxRed.labelMalePlural>
+  <FoxRed.labelFemale>母赤狐</FoxRed.labelFemale>
+  <FoxRed.labelFemalePlural>母赤狐</FoxRed.labelFemalePlural>
 
 
   <!-- Fox arctic -->
 
   <FoxArctic.label>北极狐</FoxArctic.label>
   <FoxArctic.labelPlural>北极狐</FoxArctic.labelPlural>
-  <FoxArctic.labelMale>公北极狐</FoxArctic.labelMale>
-  <FoxArctic.labelMalePlural>公北极狐</FoxArctic.labelMalePlural>
-  <FoxArctic.labelFemale>母北极狐</FoxArctic.labelFemale>
-  <FoxArctic.labelFemalePlural>母北极狐</FoxArctic.labelFemalePlural>
   <FoxArctic.lifeStages.0.label>北极狐幼崽</FoxArctic.lifeStages.0.label>
   <FoxArctic.lifeStages.0.labelPlural>北极狐幼崽</FoxArctic.lifeStages.0.labelPlural>
   <FoxArctic.lifeStages.0.labelMale>北极狐幼崽</FoxArctic.lifeStages.0.labelMale>
@@ -164,6 +160,10 @@
   <FoxArctic.lifeStages.2.labelMalePlural>公北极狐</FoxArctic.lifeStages.2.labelMalePlural>
   <FoxArctic.lifeStages.2.labelFemale>母北极狐</FoxArctic.lifeStages.2.labelFemale>
   <FoxArctic.lifeStages.2.labelFemalePlural>母北极狐</FoxArctic.lifeStages.2.labelFemalePlural>
+  <FoxArctic.labelMale>公北极狐</FoxArctic.labelMale>
+  <FoxArctic.labelMalePlural>公北极狐</FoxArctic.labelMalePlural>
+  <FoxArctic.labelFemale>母北极狐</FoxArctic.labelFemale>
+  <FoxArctic.labelFemalePlural>母北极狐</FoxArctic.labelFemalePlural>
 
 
 </LanguageData>

DefInjected/RaidStrategyDef/RaidStrategies.xml

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <ImmediateAttack.letterLabelEnemy>袭击</ImmediateAttack.letterLabelEnemy>
-  <ImmediateAttack.arrivalTextEnemy>他们会立即开始进攻。</ImmediateAttack.arrivalTextEnemy>
-  <ImmediateAttack.letterLabelFriendly>友军</ImmediateAttack.letterLabelFriendly>
   <ImmediateAttack.arrivalTextFriendly>他们会立即支援你。</ImmediateAttack.arrivalTextFriendly>
+  <ImmediateAttack.arrivalTextEnemy>他们会立即开始进攻。</ImmediateAttack.arrivalTextEnemy>
+  <ImmediateAttack.letterLabelEnemy>袭击</ImmediateAttack.letterLabelEnemy>
+  <ImmediateAttack.letterLabelFriendly>友军</ImmediateAttack.letterLabelFriendly>
 
-  <ImmediateAttackSmart.letterLabelEnemy>袭击</ImmediateAttackSmart.letterLabelEnemy>
-  <ImmediateAttackSmart.arrivalTextEnemy>他们会立即开始进攻。\n\n注意：他们似乎异常聪明地采取了战术。</ImmediateAttackSmart.arrivalTextEnemy>
-  <ImmediateAttackSmart.letterLabelFriendly>友军</ImmediateAttackSmart.letterLabelFriendly>
   <ImmediateAttackSmart.arrivalTextFriendly>他们会立即支援你。</ImmediateAttackSmart.arrivalTextFriendly>
+  <ImmediateAttackSmart.arrivalTextEnemy>他们会立即开始进攻。\n\n注意：他们似乎异常聪明地采取了战术。</ImmediateAttackSmart.arrivalTextEnemy>
+  <ImmediateAttackSmart.letterLabelEnemy>袭击</ImmediateAttackSmart.letterLabelEnemy>
+  <ImmediateAttackSmart.letterLabelFriendly>友军</ImmediateAttackSmart.letterLabelFriendly>
 
-  <StageThenAttack.letterLabelEnemy>袭击</StageThenAttack.letterLabelEnemy>
-  <StageThenAttack.arrivalTextEnemy>他们会准备一段时间，然后进攻。\n\n准备好防御或是先发制人去攻击他们。</StageThenAttack.arrivalTextEnemy>
-  <StageThenAttack.letterLabelFriendly>友军</StageThenAttack.letterLabelFriendly>
   <StageThenAttack.arrivalTextFriendly>他们会在支援你之前准备一段时间。</StageThenAttack.arrivalTextFriendly>
+  <StageThenAttack.arrivalTextEnemy>他们会准备一段时间，然后进攻。\n\n准备好防御或是先发制人去攻击他们。</StageThenAttack.arrivalTextEnemy>
+  <StageThenAttack.letterLabelEnemy>袭击</StageThenAttack.letterLabelEnemy>
+  <StageThenAttack.letterLabelFriendly>友军</StageThenAttack.letterLabelFriendly>
 
-  <ImmediateAttackSappers.letterLabelEnemy>袭击</ImmediateAttackSappers.letterLabelEnemy>
   <ImmediateAttackSappers.arrivalTextEnemy>看来他们想用工程兵挖掘隧道来攻破殖民地的防御圈。</ImmediateAttackSappers.arrivalTextEnemy>
+  <ImmediateAttackSappers.letterLabelEnemy>袭击</ImmediateAttackSappers.letterLabelEnemy>
 
-  <Siege.letterLabelEnemy>围攻</Siege.letterLabelEnemy>
-  <Siege.arrivalTextEnemy>看来他们想包围你的殖民地，然后用迫击炮远远的轰炸殖民地，你可以等他们离开，或者去主动攻击他们。</Siege.arrivalTextEnemy>
-  <Siege.letterLabelFriendly>友军</Siege.letterLabelFriendly>
   <Siege.arrivalTextFriendly>看来他们想用包围策略来支援你。</Siege.arrivalTextFriendly>
+  <Siege.arrivalTextEnemy>看来他们想包围你的殖民地，然后用迫击炮远远的轰炸殖民地，你可以等他们离开，或者去主动攻击他们。</Siege.arrivalTextEnemy>
+  <Siege.letterLabelEnemy>围攻</Siege.letterLabelEnemy>
+  <Siege.letterLabelFriendly>友军</Siege.letterLabelFriendly>
 
 
 </LanguageData>

DefInjected/RecipeDef/Recipes_Add_Administer.xml

@@ -6,6 +6,9 @@
   <Administer_Beer.label>施用啤酒</Administer_Beer.label>
   <Administer_Beer.jobString>正在施用啤酒。</Administer_Beer.jobString>
 
+  <Administer_Ambrosia.label>Administer ambrosia</Administer_Ambrosia.label>
+  <Administer_Ambrosia.jobString>Administering ambrosia.</Administer_Ambrosia.jobString>
+
   <Administer_GoJuice.label>施用活力水</Administer_GoJuice.label>
   <Administer_GoJuice.jobString>正在施用活力水。</Administer_GoJuice.jobString>
 

DefInjected/ResearchProjectDef/ResearchProjects_Tier3_Misc.xml

@@ -24,5 +24,8 @@
   <MultiAnalyzer.label>多元分析仪</MultiAnalyzer.label>
   <MultiAnalyzer.description>解锁建造多元分析仪，提高研究速度，以及解锁更高级的研究项目，必须建造在高级研究台旁。</MultiAnalyzer.description>
 
+  <LongRangeMineralScanner.label>long-range mineral scanner</LongRangeMineralScanner.label>
+  <LongRangeMineralScanner.description>Allows the construction of long-range mineral scanners which automatically detect precious minerals like gold or jade in the nearby areas (but not in which the scanners were built).\n\nThe lumps are found on average once per 30 days within a radius of 30 tiles.\n\nBuilding more than one scanner in the same or nearby areas has little to no effect.</LongRangeMineralScanner.description>
+
 
 </LanguageData>

DefInjected/RiverDef/RiverDefs.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <HugeRiver.label>huge river</HugeRiver.label>
+  <LargeRiver.label>large river</LargeRiver.label>
+  <River.label>river</River.label>
+  <Creek.label>creek</Creek.label>
+
+
+</LanguageData>

DefInjected/RoadDef/RoadDefs.xml

@@ -4,8 +4,11 @@
   <DirtPath.label>dirt path</DirtPath.label>
   <DirtRoad.label>dirt road</DirtRoad.label>
   <StoneRoad.label>stone road</StoneRoad.label>
-  <BrokenAsphaltRoad.label>broken asphalt road</BrokenAsphaltRoad.label>
-  <BrokenAsphaltHighway.label>broken asphalt highway</BrokenAsphaltHighway.label>
+  <AncientAsphaltRoad.label>ancient asphalt road</AncientAsphaltRoad.label>
+  <AncientAsphaltHighway.label>ancient asphalt highway</AncientAsphaltHighway.label>
 
 
+  <!--<BrokenAsphaltRoad.label>broken asphalt road</BrokenAsphaltRoad.label>-->
+  <!--<BrokenAsphaltHighway.label>broken asphalt highway</BrokenAsphaltHighway.label>-->
+
 </LanguageData>

DefInjected/RulePackDef/RulePacks_Art_DescriptionRoot.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <ArtDescriptionRoot_HasTale.rulePack.rulesStrings.0>art_description_root->[physical_description_root] [context_sentence]</ArtDescriptionRoot_HasTale.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_Art_ImagesTaleless.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <TalelessImages.rulePack.rulesStrings.0>image->一名[outlander]被一群[outlander]团团包围</TalelessImages.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_Art_NameRoots.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <ArtName_Weapon.rulePack.rulesStrings.0>art_name->[badassconcept]</ArtName_Weapon.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_Art_PhysicalDescriptionRoots.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <!-- Different physical description roots for different kinds of artworks. 

DefInjected/RulePackDef/RulePacks_Global.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <GlobalUtility.rulePack.rulesStrings.0>quantity_adjphrase->一群</GlobalUtility.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_InteractionsExtra.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <Sentence_SocialFightStarted.rulePack.rulesStrings.0>sent->这让[recipient_nameShortDef]变得愤怒并且[recipient_pronoun]开始打架了！</Sentence_SocialFightStarted.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_NameMaker_World.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <NamerWorld.rulePack.rulesStrings.0>name->[celestialname]</NamerWorld.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_NameMakers_Animals.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <NamerAnimalGenericMale.rulePack.rulesStrings.0>name->[animalnameunisex]</NamerAnimalGenericMale.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_NameMakers_Factions.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <!-- Player -->

DefInjected/RulePackDef/RulePacks_NameMakers_People.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <NamerPersonTribal.rulePack.rulesStrings.0>name->[tribalword] '[badassanimal]' [tribalword]</NamerPersonTribal.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_NameMakers_Scenarios.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <NamerScenario.rulePack.rulesStrings.0>name->[weapon]的[story]</NamerScenario.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_NameMakers_Traders.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <NamerTraderGeneral.rulePack.rulesStrings.0>name->[businessname][businesstype]</NamerTraderGeneral.rulePack.rulesStrings.0>

DefInjected/RulePackDef/RulePacks_Seeds.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <SeedGenerator.rulePack.rulesStrings.0>seed->[personnamemale]</SeedGenerator.rulePack.rulesStrings.0>

DefInjected/ScenPartDef/ScenParts_Various.xml

@@ -14,7 +14,7 @@
   <ForcedHediff.label>强制健康状态</ForcedHediff.label>
   <SetNeedLevel.label>设置需求等级</SetNeedLevel.label>
   <StartingResearch.label>开局科技</StartingResearch.label>
-  <MapCondition_Planetkiller.label>行星毁灭</MapCondition_Planetkiller.label>
+  <GameCondition_Planetkiller.label>planetkiller weapon incoming</GameCondition_Planetkiller.label>
 
 
   <!-- rules changes -->
@@ -39,11 +39,14 @@
   <DisableIncident.label>禁用事件</DisableIncident.label>
   <CreateIncident.label>创建事件</CreateIncident.label>
   <Rule_DisallowBuilding.label>禁止建造</Rule_DisallowBuilding.label>
-  <PermanentMapCondition.label>地图永久状态</PermanentMapCondition.label>
+  <PermanentGameCondition.label>permanent game condition</PermanentGameCondition.label>
   <StartingAnimal.label>开局动物</StartingAnimal.label>
   <StartingThing_Defined.label>开局资源</StartingThing_Defined.label>
   <ScatterThingsNearPlayerStart.label>起始点周围资源</ScatterThingsNearPlayerStart.label>
   <ScatterThingsAnywhere.label>地图散落资源</ScatterThingsAnywhere.label>
 
 
+  <!--<MapCondition_Planetkiller.label>行星毁灭</MapCondition_Planetkiller.label>-->
+  <!--<PermanentMapCondition.label>地图永久状态</PermanentMapCondition.label>-->
+
 </LanguageData>

DefInjected/ScenarioDef/Scenarios_Classic.xml

@@ -4,8 +4,8 @@
   <Crashlanded.label>迫降</Crashlanded.label>
   <Crashlanded.description>你们三人在刺耳的警报声与金属碎裂声中从低温休眠舱内醒来，然后勉强在飞船四分五裂前钻进了逃生舱内。随后不久，你们降落到了这个充满未知的边缘世界上。</Crashlanded.description>
   <Crashlanded.scenario.name>迫降</Crashlanded.scenario.name>
-  <Crashlanded.scenario.description>你们三人在刺耳的警报声与金属碎裂声中从低温休眠舱内醒来，然后勉强在飞船四分五裂前钻进了逃生舱内。随后不久，你们降落到了这个充满未知的边缘世界上。</Crashlanded.scenario.description>
   <Crashlanded.scenario.summary>三名迫降生还者 - RimWorld经典的开局模式。</Crashlanded.scenario.summary>
+  <Crashlanded.scenario.description>你们三人在刺耳的警报声与金属碎裂声中从低温休眠舱内醒来，然后勉强在飞船四分五裂前钻进了逃生舱内。随后不久，你们降落到了这个充满未知的边缘世界上。</Crashlanded.scenario.description>
 
 
 </LanguageData>

DefInjected/ScenarioDef/Scenarios_Special.xml

@@ -4,15 +4,15 @@
   <TheRichExplorer.label>富有的探险家</TheRichExplorer.label>
   <TheRichExplorer.description>离开了你在闪耀世界的家，大家都说你疯了，但你一直渴望丢掉虚拟头盔，而在真正的星际间探险。现在你从漫长的低温休眠旅程中苏醒过来，降落在一个未知的边缘世界上，那就看看到底如何吧。</TheRichExplorer.description>
   <TheRichExplorer.scenario.name>富有的探险家</TheRichExplorer.scenario.name>
-  <TheRichExplorer.scenario.description>离开了你在闪耀世界的家，大家都说你疯了，但你一直渴望丢掉虚拟头盔，而在真正的星际间探险。现在你从漫长的低温休眠旅程中苏醒过来，降落在一个未知的边缘世界上，那就看看到底如何吧。</TheRichExplorer.scenario.description>
   <TheRichExplorer.scenario.summary>一个富有的探险家在宇宙中前所未有的经历。</TheRichExplorer.scenario.summary>
+  <TheRichExplorer.scenario.description>离开了你在闪耀世界的家，大家都说你疯了，但你一直渴望丢掉虚拟头盔，而在真正的星际间探险。现在你从漫长的低温休眠旅程中苏醒过来，降落在一个未知的边缘世界上，那就看看到底如何吧。</TheRichExplorer.scenario.description>
   <TheRichExplorer.scenario.parts.12.text>无论是神经模拟器、全息游戏，还是放纵的酒会都无法满足你，你想要的更多，你想感受人生的坎坷和因果机缘，就像历史书里描述的那样。你希望了解真正的挑战与后果是什么。\n\n而此刻，经过了数十年的低温休眠，你降落在了这片未知的边缘世界上。真实的挑战在等待着你。</TheRichExplorer.scenario.parts.12.text>
 
   <LostTribe.label>失落的部落</LostTribe.label>
   <LostTribe.description>神明派出大量极度残暴的机械体毁灭了你的部落。你们五人死里逃生。现在是时候建造一个新的家园了。</LostTribe.description>
   <LostTribe.scenario.name>失落的部落</LostTribe.scenario.name>
-  <LostTribe.scenario.description>神明派出大量极度残暴的机械体毁灭了你的部落。你们五人死里逃生。现在是时候建造一个新的家园了。</LostTribe.scenario.description>
   <LostTribe.scenario.summary>五个幸存的部落人顽强重建家园。</LostTribe.scenario.summary>
+  <LostTribe.scenario.description>神明派出大量极度残暴的机械体毁灭了你的部落。你们五人死里逃生。现在是时候建造一个新的家园了。</LostTribe.scenario.description>
   <LostTribe.scenario.parts.14.text>神，非常愤怒。血腥的机械体在漆黑的夜晚降临。他们席卷了你的村庄，用他们的镰刃收割着生命，用他们的魔焰焚烧着大地。\n\n你们中只有少数几人逃了出来。现在，经过了悲痛的旅程后，无依无靠，你们必须像你的祖先那样，在荒野中建设你们的家园。</LostTribe.scenario.parts.14.text>
 
 

DefInjected/TaleDef/Tales_DoublePawn.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <Captured.label>俘虏</Captured.label>

DefInjected/TaleDef/Tales_DoublePawn_Relationships.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <BondedWithAnimal.label>发展牵绊</BondedWithAnimal.label>

DefInjected/TaleDef/Tales_NoPawn.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <RaidArrived.label>敌人来袭</RaidArrived.label>

DefInjected/TaleDef/Tales_SinglePawn.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
   <LandedInPod.label>空投舱着陆</LandedInPod.label>

DefInjected/TerrainDef/Terrain_FloorsStoneTile.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <TileSandstone.label>砂岩地砖</TileSandstone.label>
-  <TileSandstone.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileSandstone.description>
+  <!--<TileSandstone.label>砂岩地砖</TileSandstone.label>-->
+  <!--<TileSandstone.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileSandstone.description>-->
 
-  <TileGranite.label>花岗岩地砖</TileGranite.label>
-  <TileGranite.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileGranite.description>
+  <!--<TileGranite.label>花岗岩地砖</TileGranite.label>-->
+  <!--<TileGranite.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileGranite.description>-->
 
-  <TileLimestone.label>石灰岩地砖</TileLimestone.label>
-  <TileLimestone.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileLimestone.description>
+  <!--<TileLimestone.label>石灰岩地砖</TileLimestone.label>-->
+  <!--<TileLimestone.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileLimestone.description>-->
 
-  <TileSlate.label>板岩地砖</TileSlate.label>
-  <TileSlate.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileSlate.description>
+  <!--<TileSlate.label>板岩地砖</TileSlate.label>-->
+  <!--<TileSlate.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileSlate.description>-->
 
-  <TileMarble.label>大理石地砖</TileMarble.label>
-  <TileMarble.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileMarble.description>
+  <!--<TileMarble.label>大理石地砖</TileMarble.label>-->
+  <!--<TileMarble.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileMarble.description>-->
 
 
 </LanguageData>

DefInjected/TerrainDef/Terrain_Floors_Burned.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <BurnedWoodPlankFloor.label>burned wood floor</BurnedWoodPlankFloor.label>
+  <BurnedWoodPlankFloor.description>Burned out wood plank flooring.</BurnedWoodPlankFloor.description>
+
+  <BurnedCarpet.label>burned carpet</BurnedCarpet.label>
+  <BurnedCarpet.description>Burned out carpet.</BurnedCarpet.description>
+
+
+</LanguageData>

DefInjected/TerrainDef/Terrain_Floors_StoneTile.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <TileSandstone.label>砂岩地砖</TileSandstone.label>
+  <TileSandstone.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileSandstone.description>
+
+  <TileGranite.label>花岗岩地砖</TileGranite.label>
+  <TileGranite.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileGranite.description>
+
+  <TileLimestone.label>石灰岩地砖</TileLimestone.label>
+  <TileLimestone.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileLimestone.description>
+
+  <TileSlate.label>板岩地砖</TileSlate.label>
+  <TileSlate.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileSlate.description>
+
+  <TileMarble.label>大理石地砖</TileMarble.label>
+  <TileMarble.description>坚固的石质地砖给人以城堡一样的感觉。看起来很漂亮，就是铺设速度较慢。</TileMarble.description>
+
+  <FlagstoneSandstone.label>sandstone flagstone</FlagstoneSandstone.label>
+  <FlagstoneSandstone.description>Roughly-cut stone tiles. Not super pretty, but they make good surfaces for roads and outdoor walkways.</FlagstoneSandstone.description>
+
+  <FlagstoneGranite.label>granite flagstone</FlagstoneGranite.label>
+  <FlagstoneGranite.description>Roughly-cut stone tiles. Not super pretty, but they make good surfaces for roads and outdoor walkways.</FlagstoneGranite.description>
+
+  <FlagstoneLimestone.label>limestone flagstone</FlagstoneLimestone.label>
+  <FlagstoneLimestone.description>Roughly-cut stone tiles. Not super pretty, but they make good surfaces for roads and outdoor walkways.</FlagstoneLimestone.description>
+
+  <FlagstoneSlate.label>slate flagstone</FlagstoneSlate.label>
+  <FlagstoneSlate.description>Roughly-cut stone tiles. Not super pretty, but they make good surfaces for roads and outdoor walkways.</FlagstoneSlate.description>
+
+  <FlagstoneMarble.label>marble flagstone</FlagstoneMarble.label>
+  <FlagstoneMarble.description>Roughly-cut stone tiles. Not super pretty, but they make good surfaces for roads and outdoor walkways.</FlagstoneMarble.description>
+
+
+</LanguageData>

DefInjected/TerrainDef/Terrain_Water.xml

@@ -2,7 +2,9 @@
 <LanguageData>
 
   <WaterDeep.label>深水</WaterDeep.label>
+  <WaterMovingDeep.label>deep moving water</WaterMovingDeep.label>
   <WaterShallow.label>浅水</WaterShallow.label>
+  <WaterMovingShallow.label>shallow moving water</WaterMovingShallow.label>
 
 
 </LanguageData>

DefInjected/ThingDef/Ambrosia.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <Ambrosia.label>ambrosia</Ambrosia.label>
+  <Ambrosia.description>A soft fruit. Ambrosia has a wonderful smell and taste, and produces a soft chemical high, which increases mood. However, it is slightly addictive if eaten too often.</Ambrosia.description>
+
+
+</LanguageData>

DefInjected/ThingDef/Buildings_Ancient.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <AncientConcreteBarrier.label>ancient concrete barrier</AncientConcreteBarrier.label>
+  <AncientConcreteBarrier.description>A traffic management solution from long ago.</AncientConcreteBarrier.description>
+
+  <AncientLamppost.label>ancient lamppost</AncientLamppost.label>
+  <AncientLamppost.description>Road lighting from long ago. No longer functional.</AncientLamppost.description>
+
+
+</LanguageData>

DefInjected/ThingDef/Buildings_Misc.xml

@@ -29,6 +29,11 @@
   <GroundPenetratingScanner_Blueprint.label>地质扫描仪（蓝图）</GroundPenetratingScanner_Blueprint.label>
   <GroundPenetratingScanner_Frame.label>地质扫描仪（建造中）</GroundPenetratingScanner_Frame.label>
 
+  <LongRangeMineralScanner.label>long-range mineral scanner</LongRangeMineralScanner.label>
+  <LongRangeMineralScanner.description>Automatically detects precious minerals like gold or jade in the nearby areas (but not in which it was built). The lumps are found on average once per 30 days within a radius of 30 tiles. Building more than one scanner in the same or nearby areas has little to no effect.</LongRangeMineralScanner.description>
+  <LongRangeMineralScanner_Blueprint.label>long-range mineral scanner (blueprint)</LongRangeMineralScanner_Blueprint.label>
+  <LongRangeMineralScanner_Frame.label>long-range mineral scanner (building)</LongRangeMineralScanner_Frame.label>
+
 
   <!-- Transport pods -->
 

DefInjected/ThingDef/Filth_Various.xml

@@ -23,6 +23,7 @@
   <FilthFuel.description>一滩可燃的化学物质。</FilthFuel.description>
 
   <FilthCorpseBile.label>尸液</FilthCorpseBile.label>
+  <FilthAsh.label>ash</FilthAsh.label>
 
 
 </LanguageData>

DefInjected/ThingDef/Plants_Special.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <BurnedTree.label>burned tree</BurnedTree.label>
+  <BurnedTree.description>A burned tree. Yields no usable wood.</BurnedTree.description>
+
+  <PlantAmbrosia.label>ambrosia bush</PlantAmbrosia.label>
+  <PlantAmbrosia.description>A rarely-sprouting bush which yields the ambrosia fruit. Ambrosia is pleasurable to eat and produces a slightly addictive chemical warmth effect.</PlantAmbrosia.description>
+
+
+</LanguageData>

DefInjected/ThingDef/_Terrain_Extra.xml

@@ -54,5 +54,20 @@
   <TileMarble_Blueprint.label>板岩地砖（蓝图）</TileMarble_Blueprint.label>
   <TileMarble_Frame.label>板岩地砖（建造中）</TileMarble_Frame.label>
 
+  <FlagstoneSandstone_Blueprint.label>sandstone flagstone (blueprint)</FlagstoneSandstone_Blueprint.label>
+  <FlagstoneSandstone_Frame.label>sandstone flagstone (building)</FlagstoneSandstone_Frame.label>
+
+  <FlagstoneGranite_Blueprint.label>granite flagstone (blueprint)</FlagstoneGranite_Blueprint.label>
+  <FlagstoneGranite_Frame.label>granite flagstone (building)</FlagstoneGranite_Frame.label>
+
+  <FlagstoneLimestone_Blueprint.label>limestone flagstone (blueprint)</FlagstoneLimestone_Blueprint.label>
+  <FlagstoneLimestone_Frame.label>limestone flagstone (building)</FlagstoneLimestone_Frame.label>
+
+  <FlagstoneSlate_Blueprint.label>slate flagstone (blueprint)</FlagstoneSlate_Blueprint.label>
+  <FlagstoneSlate_Frame.label>slate flagstone (building)</FlagstoneSlate_Frame.label>
+
+  <FlagstoneMarble_Blueprint.label>marble flagstone (blueprint)</FlagstoneMarble_Blueprint.label>
+  <FlagstoneMarble_Frame.label>marble flagstone (building)</FlagstoneMarble_Frame.label>
+
 
 </LanguageData>

DefInjected/ThoughtDef/Ambrosia.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <AmbrosiaHigh.stages.0.label>ambrosia warmth</AmbrosiaHigh.stages.0.label>
+  <AmbrosiaHigh.stages.0.description>That ambrosia makes me feel a little bit more relaxed, but with more energy too.</AmbrosiaHigh.stages.0.description>
+
+
+  <!-- Ambrosia addiction -->
+
+  <AmbrosiaWithdrawal.stages.1.label>ambrosia withdrawal</AmbrosiaWithdrawal.stages.1.label>
+  <AmbrosiaWithdrawal.stages.1.description>I just feel heavy and cold all the time. I never thought I'd want a piece of fruit so much.</AmbrosiaWithdrawal.stages.1.description>
+
+
+</LanguageData>

DefInjected/TraitDef/Traits_Singular.xml

@@ -67,5 +67,8 @@
   <Pyromaniac.degreeDatas.0.label>纵火狂</Pyromaniac.degreeDatas.0.label>
   <Pyromaniac.degreeDatas.0.description>NAME迷恋火焰。HECAP偶尔会放火且从不扑灭火焰。</Pyromaniac.degreeDatas.0.description>
 
+  <Wimp.degreeDatas.0.label>wimp</Wimp.degreeDatas.0.label>
+  <Wimp.degreeDatas.0.description>NAME is weak and cowardly. Even a little pain will immobilize HIM.</Wimp.degreeDatas.0.description>
+
 
 </LanguageData>

DefInjected/WorldObjectDef/Incidents_Caravan.xml

@@ -3,8 +3,8 @@
 
   <!-- Ambush -->
 
-  <Ambush.label>伏击</Ambush.label>
-  <Ambush.description>一场正在进行中的伏击战。</Ambush.description>
+  <!--<Ambush.label>伏击</Ambush.label>-->
+  <!--<Ambush.description>一场正在进行中的伏击战。</Ambush.description>-->
 
 
 </LanguageData>

DefInjected/WorldObjectDef/Incidents_Caravan_All.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <!-- Threats -->
+
+  <Ambush.label>伏击</Ambush.label>
+  <Ambush.description>一场正在进行中的伏击战。</Ambush.description>
+
+
+</LanguageData>

Keyed/Designators.xml

@@ -58,9 +58,9 @@
   <DesignatorAreaSnowClearClear>移除除雪区</DesignatorAreaSnowClearClear>
   <DesignatorAreaSnowClearClearDesc>移除一片除雪区。殖民者不会再清除该区域的雪。</DesignatorAreaSnowClearClearDesc>
 
-  <DesignatorExpandAreaAllowed>添加活动区</DesignatorExpandAreaAllowed>
+  <DesignatorExpandAreaAllowed>添加允许活动区</DesignatorExpandAreaAllowed>
   <DesignatorExpandAreaAllowedDesc>添加一片活动区。\n\n分配过活动区的殖民者不会进行位于活动区以外的工作指令，也不会在活动区外自动寻找所需物品。</DesignatorExpandAreaAllowedDesc>
-  <DesignatorClearAreaAllowed>移除活动区</DesignatorClearAreaAllowed>
+  <DesignatorClearAreaAllowed>移除允许活动区</DesignatorClearAreaAllowed>
   <DesignatorClearAreaAllowedDesc>移除一片活动区。\n\n分配过活动区的殖民者不会进行位于活动区以外的工作指令，也不会在活动区外自动寻找所需物品。</DesignatorClearAreaAllowedDesc>
   <ManageAreas>管理活动区</ManageAreas>
 

Keyed/FloatMenu.xml

@@ -122,6 +122,7 @@
   <EnterMap>进入{0}</EnterMap>
   <VisitSettlement>访问{0}</VisitSettlement>
   <VisitSite>Visit</VisitSite>
+  <AttackSite>Attack {0}</AttackSite>
   <AttackSettlement>进攻{0}</AttackSettlement>
 
   <!-- Specific thing interactions -->

Keyed/Incidents.xml

@@ -139,4 +139,15 @@
   <CaravanDemand_Give>Give and pass</CaravanDemand_Give>
   <CaravanDemand_Fight>Refuse and fight</CaravanDemand_Fight>
 
+  <!-- Temporary item stash -->
+  <ItemStashQuestTitle>Item stash opportunity</ItemStashQuestTitle>
+  <ItemStashQuest_Accept>Accept</ItemStashQuest_Accept>
+  <ItemStashQuest_Reject>Reject</ItemStashQuest_Reject>
+  <ItemStashQuestFeeDemand>{0} is willing to tell us the location of the stash in exchange for {1} silver.</ItemStashQuestFeeDemand>
+  <ItemStashSitePart_Unknown>Unfortunately, {0} has no idea who or what - if anything - might be guarding the stash.</ItemStashSitePart_Unknown>
+  <ItemStashSitePart_Nothing>{0} says that the stash is unguarded.</ItemStashSitePart_Nothing>
+  <ItemStashSitePart_Outpost>{0} says that there is an enemy outpost nearby.</ItemStashSitePart_Outpost>
+  <ItemStashSitePart_Turrets>{0} says that the stash is surrounded by enemy turrets.</ItemStashSitePart_Turrets>
+  <ItemStashSitePart_Manhunters>{0} says that there is a group of manhunting animals wandering nearby.</ItemStashSitePart_Manhunters>
+
 </LanguageData>

Keyed/Letters.xml

@@ -144,4 +144,8 @@
   <LetterLabelPawnsLostDueToMapCountdown>被抛弃</LetterLabelPawnsLostDueToMapCountdown>
   <LetterPawnsLostDueToMapCountdown>一些动物和囚犯被抛弃于荒野中：\n\n{0}</LetterPawnsLostDueToMapCountdown>
 
+  <!-- Quest completed -->
+  <LetterLabelDefeatAllEnemiesQuestCompleted>Quest completed</LetterLabelDefeatAllEnemiesQuestCompleted>
+  <LetterDefeatAllEnemiesQuestCompleted>You have defeated the enemy outpost!\n\nThe payment from {0} has arrived, and faction relations have improved by {1}.</LetterDefeatAllEnemiesQuestCompleted>
+
 </LanguageData>

Keyed/Menus_Main.xml

@@ -120,6 +120,7 @@
   <Biome>生态系统</Biome>
   <Terrain>地形</Terrain>
   <Road>Road</Road>
+  <River>River</River>
   <Elevation>海拔</Elevation>
   <Fertility>肥沃度</Fertility>
   <AvgTemp>平均温度</AvgTemp>

Keyed/Messages.xml

@@ -214,6 +214,7 @@
   <MessageDefendersAttacking>来自{1}的{0}正在攻击你的{2}。</MessageDefendersAttacking>
 
   <MessageSelfTendUnsatisfied>{0}已启用自我治疗，但未指派「医生」工作。</MessageSelfTendUnsatisfied>
+  <MessageCannotSelfTendEver>{0} is incapable of doing Doctor work, and so cannot ever self-tend.</MessageCannotSelfTendEver>
 
   <MessageCantAddWaypointBecauseImpassable>此格子无法通行。</MessageCantAddWaypointBecauseImpassable>
   <MessageCantAddWaypointBecauseUnreachable>无法从最后一个路径点到达此格子。</MessageCantAddWaypointBecauseUnreachable>
@@ -222,4 +223,7 @@
 
   <MessageCantDoExecutionBecauseNoWardenCapableOfViolence>没有可行使暴力行为的狱卒。处决不会被执行。</MessageCantDoExecutionBecauseNoWardenCapableOfViolence>
 
+  <MessageSiteCountdownBecauseNoMoreEnemies>You have defeated all enemies. In {0}, the caravan will automatically be reformed.</MessageSiteCountdownBecauseNoMoreEnemies>
+  <MessageSiteCountdownBecauseNoEnemiesInitially>In {0}, the caravan will automatically be reformed. You can reform the caravan now in the World screen.</MessageSiteCountdownBecauseNoEnemiesInitially>
+
 </LanguageData>

Keyed/Misc_Gameplay.xml

@@ -109,6 +109,9 @@
   <VentClosed>已关闭</VentClosed>
   <WornBy>worn by {0}</WornBy>
   <EquippedBy>equipped by {0}</EquippedBy>
+  <QuestTargetDestroyInspectString>{0} wants this destroyed.\n    Reward: {1}.</QuestTargetDestroyInspectString>
+  <WorldObjectTimeout>Time left: {0}</WorldObjectTimeout>
+  <LongRangeMineralScannerEfficiency>Efficiency: {0}</LongRangeMineralScannerEfficiency>
 
   <!-- Fermentation barrel -->
   <ContainsWort>装有麦芽汁：{0} / {1}</ContainsWort>
@@ -333,8 +336,8 @@
   <Burning>燃烧中</Burning>
   <FireSizeLower>火焰大小：{0}</FireSizeLower>
 
-  <!-- Map conditions -->
-  <MapConditionsTip>当前影响此地区的地图状态。</MapConditionsTip>
+  <!-- Game conditions -->
+  <GameConditionsTip>Special conditions affecting the area right now.</GameConditionsTip>
   <TimeLeft>剩余时间</TimeLeft>
   <ImpactDate>撞击日期</ImpactDate>
 
@@ -474,4 +477,7 @@
   <OutfitSoldier>Soldier</OutfitSoldier>
   <OutfitNudist>Nudist</OutfitNudist>
 
+  <!-- Map conditions -->
+  <!--<MapConditionsTip>当前影响此地区的地图状态。</MapConditionsTip>-->
+
 </LanguageData>

Keyed/ScenParts.xml

@@ -35,9 +35,11 @@
 
   <ScenPart_StartWith>开局资源</ScenPart_StartWith>
   <ScenPart_MapScatteredWith>地图散落资源</ScenPart_MapScatteredWith>
-  <ScenPart_PermaMapCondition>地图永久状态</ScenPart_PermaMapCondition>
+  <ScenPart_PermaGameCondition>Permanent game condition(s)</ScenPart_PermaGameCondition>
   <ScenPart_DisableIncident>已禁用以下随机事件</ScenPart_DisableIncident>
   <ScenPart_CreateIncident>已创建以下随机事件</ScenPart_CreateIncident>
   <ScenPart_DisallowBuilding>禁止建造建筑</ScenPart_DisallowBuilding>
 
+  <!--<ScenPart_PermaMapCondition>地图永久状态</ScenPart_PermaMapCondition>-->
+
 </LanguageData>

Keyed/Time.xml

@@ -26,8 +26,8 @@
   <!-- Date periods -->
   <Period1Year>1 年</Period1Year>
   <PeriodYears>{0} 年</PeriodYears>
-  <Period1Season>1 季度</Period1Season>
-  <PeriodSeasons>{0} 季度</PeriodSeasons>
+  <Period1Quadrum>1 quadrum</Period1Quadrum>
+  <PeriodQuadrums>{0} quadrums</PeriodQuadrums>
   <Period1Day>1 天</Period1Day>
   <PeriodDays>{0} 天</PeriodDays>
   <Period1Hour>1 小时</Period1Hour>
@@ -38,4 +38,7 @@
   <Lasted>已持续</Lasted>
   <OccurredTimeAgo>发生于{0}前</OccurredTimeAgo>
 
+  <!--<Period1Season>1 季度</Period1Season>-->
+  <!--<PeriodSeasons>{0} 季度</PeriodSeasons>-->
+
 </LanguageData>