From 32fc39927ef51d14a02d50ae1ce7f741894851d7 Mon Sep 17 00:00:00 2001
From: "duduluu@outlook.com" <duduluu@outlook.com>
Date: Wed, 10 May 2017 07:20:43 +0800
Subject: [PATCH] Update to 0.17.1533 rev823 (development build)

---
 DefInjected/ThingDef/Items_Unfinished.xml | 1 +
 DefInjected/TraitDef/Traits_Spectrum.xml  | 4 ++--
 Keyed/GameplayCommands.xml                | 3 ---
 Keyed/Menus_Main.xml                      | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/DefInjected/ThingDef/Items_Unfinished.xml b/DefInjected/ThingDef/Items_Unfinished.xml
index 0e7ec83c..186961ee 100644
--- a/DefInjected/ThingDef/Items_Unfinished.xml
+++ b/DefInjected/ThingDef/Items_Unfinished.xml
@@ -5,6 +5,7 @@
   <UnfinishedGun.label>未完成的枪械</UnfinishedGun.label>
   <UnfinishedWeapon.label>未完成的武器</UnfinishedWeapon.label>
   <UnfinishedTechArmor.label>未完成的护甲</UnfinishedTechArmor.label>
+  <UnfinishedMetallicTechArmor.label>未完成的护甲</UnfinishedMetallicTechArmor.label>
   <UnfinishedApparel.label>未完成的衣物</UnfinishedApparel.label>
   <UnfinishedBelt.label>未完成的腰带</UnfinishedBelt.label>
   <UnfinishedComponent.label>未完成的零部件</UnfinishedComponent.label>
diff --git a/DefInjected/TraitDef/Traits_Spectrum.xml b/DefInjected/TraitDef/Traits_Spectrum.xml
index 949925f9..59a38905 100644
--- a/DefInjected/TraitDef/Traits_Spectrum.xml
+++ b/DefInjected/TraitDef/Traits_Spectrum.xml
@@ -57,9 +57,9 @@
   <PsychicSensitivity.degreeDatas.3.description>NAME的心灵频率和一般人完全不一样。HECAP完全不受心灵感应影响。</PsychicSensitivity.degreeDatas.3.description>
 
   <ShootingAccuracy.degreeDatas.0.label>冷枪手</ShootingAccuracy.degreeDatas.0.label>
-  <ShootingAccuracy.degreeDatas.0.description>NAME的枪法还不错，但HE需要花更多的事件来瞄准HIS目标。</ShootingAccuracy.degreeDatas.0.description>
+  <ShootingAccuracy.degreeDatas.0.description>NAME在射击时会花更多的时间来瞄准。HECAP射得比别人慢，但打得更准。</ShootingAccuracy.degreeDatas.0.description>
   <ShootingAccuracy.degreeDatas.1.label>乱开枪</ShootingAccuracy.degreeDatas.1.label>
-  <ShootingAccuracy.degreeDatas.1.description>砰！砰！砰！NAME的枪法很烂，但HE从不在意，因为开枪的感觉太棒了！</ShootingAccuracy.degreeDatas.1.description>
+  <ShootingAccuracy.degreeDatas.1.description>砰！砰！砰！NAME只是喜欢扣动扳机。HECAP射得比别人快，但打得不准。</ShootingAccuracy.degreeDatas.1.description>
 
   <Beauty.degreeDatas.0.label>沉鱼落雁</Beauty.degreeDatas.0.label>
   <Beauty.degreeDatas.0.description>NAME有一张非常精致的脸蛋，HE甚至不需要开口，人们自然而然地会被HIM吸引。</Beauty.degreeDatas.0.description>
diff --git a/Keyed/GameplayCommands.xml b/Keyed/GameplayCommands.xml
index a6579c05..b9f2050e 100644
--- a/Keyed/GameplayCommands.xml
+++ b/Keyed/GameplayCommands.xml
@@ -167,11 +167,8 @@
   <!-- Settle -->
   <CommandSettle>定居</CommandSettle>
   <CommandSettleDesc>在该地区定居，你的殖民者将会进入该地区并建立新的殖民地。</CommandSettleDesc>
-  <CommandSettleFailOtherWorldObjectsHere>只有在此单元格区域内仅有你的远行队存在时才能够在该地区定居。</CommandSettleFailOtherWorldObjectsHere>
   <CommandSettleFailAlreadyHaveBase>你的派系只能拥有一个殖民地。</CommandSettleFailAlreadyHaveBase>
   <CommandSettleFailReachedMaximumNumberOfBases>殖民地数量已达上限。</CommandSettleFailReachedMaximumNumberOfBases>
-  <CommandSettleFailBiomeNotImplemented>生态区未实现。</CommandSettleFailBiomeNotImplemented>
-  <CommandSettleFailFactionBaseAdjacent>定居点互相之间不能直接相邻。</CommandSettleFailFactionBaseAdjacent>
   <CommandSettleFailNoColonists>需要有人在那里才能占领区域。</CommandSettleFailNoColonists>
   <CommandSettleFailEnemies>此区域内有敌人。</CommandSettleFailEnemies>
 
diff --git a/Keyed/Menus_Main.xml b/Keyed/Menus_Main.xml
index 9e83f345..32f48e10 100644
--- a/Keyed/Menus_Main.xml
+++ b/Keyed/Menus_Main.xml
@@ -115,6 +115,7 @@
   <BiomeNotImplemented>该生态区在游戏中尚未实现。</BiomeNotImplemented>
   <CannotLandImpassableMountains>你不能在无法逾越的山脉上着陆。</CannotLandImpassableMountains>
   <BaseAlreadyThere>该位置已被{0}的基地所占用。</BaseAlreadyThere>
+  <YourBaseAlreadyThere>你在此处已经拥有了一座基地。</YourBaseAlreadyThere>
   <TileOccupied>这个地图格已经被占领了。</TileOccupied>
   <FactionBaseAdjacent>定居点互相之间不能直接相邻。</FactionBaseAdjacent>
   <Biome>生态区</Biome>