Merge pull request #430 from VaniatD/master

update

Biotech/DefInjected/AbilityDef/Abilities.xml

@@ -71,8 +71,8 @@
   
   <!-- EN: implant genes -->
   <ReimplantXenogerm.label>注入基因</ReimplantXenogerm.label>
-  <!-- EN: Implant this person's xenogenes into a willing subject using a special injector organ. If this person's genes are currently regrowing, they will implant their xenogerm and die in the process. -->
+  <!-- EN: Implant this person's xenogenes into a willing subject using a special injector organ. If this person's genes are currently regrowing, they will implant their xenogerm and die in the process.\n\nWhen implanted, a xenogerm will overwrite the target's xenogenes. Germline genes will be unaffected. -->
-  <ReimplantXenogerm.description>使用特殊的注射器官将自身的异种基因注射到自愿移植的目标体内。如果目标在遗传物质处于填充过程时进行注射，将会导致死亡。</ReimplantXenogerm.description>
+  <ReimplantXenogerm.description>使用特殊的注射器官将自身的异种基因注射到自愿移植的目标体内。如果目标在遗传物质处于填充过程时进行注射，将会导致死亡。\n\n植入后，异种胚芽的基因会覆盖目标的异种基因，系谱基因不受影响。</ReimplantXenogerm.description>
   
   <!-- EN: resurrect -->
   <Resurrect.label>复活</Resurrect.label>

Biotech/DefInjected/PawnKindDef/Races_Mechanoids_Medium.xml

@@ -13,6 +13,6 @@
   <Mech_Scorcher.labelPlural>机械步甲</Mech_Scorcher.labelPlural>
   
   <!-- EN: tesseron -->
-  <Mech_Tesseron.label>机械猎蝽</Mech_Tesseron.label>
+  <Mech_Tesseron.label>机械刺蝽</Mech_Tesseron.label>
   
 </LanguageData>

Biotech/DefInjected/RecipeDef/Recipes_MechGestator_Medium.xml

@@ -44,9 +44,9 @@
   <Scyther.jobString>正在培育机械飞螳。</Scyther.jobString>
   
   <!-- EN: gestate tesseron -->
-  <Tesseron.label>培育机械猎蝽</Tesseron.label>
+  <Tesseron.label>培育机械刺蝽</Tesseron.label>
   <!-- EN: Gestate a tesseron mechanoid. -->
-  <Tesseron.description>培育一台机械猎蝽。</Tesseron.description>
+  <Tesseron.description>培育一台机械刺蝽。</Tesseron.description>
   <!-- EN: Gestating mech. -->
   <Tesseron.jobString>正在培育机械体。</Tesseron.jobString>
   

Biotech/DefInjected/RulePackDef/RulePacks_Namers_Xenohumans.xml

@@ -202,7 +202,7 @@
   
   <!-- EN:
     <li>r_name->[firstName] [lastName]</li>
-    <li>r_name(p=2)->[firstName] '[nickName]' [lastName]</li>
+    <li>r_name->[firstName] '[nickName]' [lastName]</li>
     <li>maybeHyphen(p=4)-></li>
     <li>maybeHyphen->-</li>
     <li>firstName(p=1)->[SylP][nameEnd]</li>
@@ -232,7 +232,7 @@
   -->
   <NamerPersonPigskin.rulePack.rulesStrings>
     <li>r_name->[firstName] [lastName]</li>
-    <li>r_name(p=2)->[firstName] '[nickName]' [lastName]</li>
+    <li>r_name->[firstName] '[nickName]' [lastName]</li>
     <li>maybeHyphen(p=4)-></li>
     <li>maybeHyphen->-</li>
     <li>firstName(p=1)->[SylP][nameEnd]</li>

Biotech/DefInjected/ThingDef/Races_Mechanoids_Medium.xml

@@ -31,7 +31,7 @@
   <Mech_Scorcher.tools.head.label>头</Mech_Scorcher.tools.head.label>
   
   <!-- EN: tesseron -->
-  <Mech_Tesseron.label>机械猎蝽</Mech_Tesseron.label>
+  <Mech_Tesseron.label>机械刺蝽</Mech_Tesseron.label>
   <!-- EN: A medium-range combat mechanoid. While it is fairly vulnerable to attacks, the tesseron's sweeping beam graser attack is so deadly that few opponents can get shots off against it. -->
   <Mech_Tesseron.description>一种中程作战的机械体。虽然它自身防护不足，但能用毁灭性的伽玛射线武器扫射对手，鲜有人能在它手下全身而退。</Mech_Tesseron.description>
   <!-- EN: left fist -->

Biotech/Keyed/Alerts.xml

@@ -106,4 +106,14 @@
   <!-- EN: A gene bank is unpowered, so the genepacks inside it are slowly deteriorating. Restore power to the gene bank to prevent the genepacks from deteriorating.\n\nOnce the gene bank is powered, it will slowly reverse the deterioration of the genepacks inside it. -->
   <AlertGenebankUnpoweredDesc>一个基因库断电了，位于其内的基因组正在缓慢劣化。恢复基因库的供电以放置基因组劣化。\n\n一旦基因库通电，它就能缓慢修复基因组的劣化。</AlertGenebankUnpoweredDesc>
 
+  <!-- EN: Deathrest complete -->
+  <AlertDeathrestComplete>死眠完成</AlertDeathrestComplete><!-- text_todo -->
+  <!-- EN: These deathresters have completed their deathrest and can be awoken safely without negative side effects: -->
+  <AlertDeathrestCompleteDesc>这些死眠者已经完成他们的死眠周期，现在能被安全唤醒：</AlertDeathrestCompleteDesc><!-- text_todo -->
+
+  <!-- EN: {0} incoming -->
+  <AlertBossgroupIncoming>{0}正在接近</AlertBossgroupIncoming><!-- text_todo -->
+  <!-- EN: Signaled by your mechanitor, a hostile {0} is approaching with its combat escort. Be prepared, this won't be an easy fight. The hostile mechanoids will arrive in a few hours or days. -->
+  <AlertBossgroupIncomingDesc>由于你机械师发出的信号，一个敌对的{0}正带着它的战斗护卫队接近。做好准备，这不会是一场轻松的战斗。敌对的机械体将在几小时或几天后到达。</AlertBossgroupIncomingDesc><!-- text_todo -->
+
 </LanguageData>

Biotech/Keyed/Letters.xml

@@ -26,8 +26,8 @@
 
   <!-- EN: Summon {LEADER_label} available -->
   <LetterLabelCommsConsoleSpawned>召唤{LEADER_label}可用</LetterLabelCommsConsoleSpawned>
-  <!-- EN: A mechanitor can use the {PARENT_label} to summon a {LEADER_label} mechanoid. If you defeat the {LEADER_label}, it will drop the following items:\n\n{REWARDSLIST} -->
+  <!-- EN: A mechanitor can use the {PARENT_label} to summon a dangerous and hostile {LEADER_label} mechanoid. Be prepared, {LEADER_label} mechanoids are extremely powerful.\n\nIf you defeat the {LEADER_label}, it will drop the following items:\n\n{REWARDSLIST} -->
-  <LetterCommsConsoleSpawned>机械师可以使用{PARENT_label}来召唤{LEADER_label}。如果你击败了{LEADER_label}，它将会掉落以下物品：\n\n{REWARDSLIST}</LetterCommsConsoleSpawned>
+  <LetterCommsConsoleSpawned>机械师可以使用{PARENT_label}来召唤危险的敌对{LEADER_label}。做好准备，{LEADER_label}机械体非常强力。\n\n如果你击败了{LEADER_label}，它将会掉落以下物品：\n\n{REWARDSLIST}</LetterCommsConsoleSpawned>
 
   <!-- EN: Summon {LEADER_label} possible -->
   <LetterLabelBossgroupCallerUnlocked>可以召唤{LEADER_label}</LetterLabelBossgroupCallerUnlocked>