From 81309350d1ff9f5137e31c5d2e936c06dff36004 Mon Sep 17 00:00:00 2001
From: duduluu <duduluu@outlook.com>
Date: Fri, 21 Oct 2016 13:52:49 +0800
Subject: [PATCH] =?UTF-8?q?SocialFighting=20=E7=BB=8F=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=98=AF=E5=8A=A8=E6=89=8B=E6=89=93=E6=9E=B6=E3=80=82=20?=
 =?UTF-8?q?=E7=94=9F=E9=95=BF=E6=9C=9F=EF=BC=9A=E4=B8=80=E5=B9=B4=E5=BD=93?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=AF=E4=BB=A5=E7=94=9F=E9=95=BF=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=AE=B5=E3=80=82=E5=A6=82=E4=B8=80=E5=B9=B4=E4=B8=AD?=
 =?UTF-8?q?=E6=98=A5=E5=A4=8F=E7=A7=8B=E9=80=82=E5=90=88=E4=BD=9C=E7=89=A9?=
 =?UTF-8?q?=E7=A7=8D=E6=A4=8D=EF=BC=8C=E5=86=AC=E5=A4=A9=E5=A4=AA=E5=86=B7?=
 =?UTF-8?q?=E4=B8=8D=E9=80=82=E5=90=88=EF=BC=8C=E4=BD=9C=E7=89=A9=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E7=94=9F=E9=95=BF=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DefInjected/MentalStateDef/MentalStates_Special.xml | 6 +++---
 Keyed/Menus_Main.xml                                | 4 ++--
 Keyed/Messages.xml                                  | 2 +-
 Keyed/Misc_Gameplay.xml                             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/DefInjected/MentalStateDef/MentalStates_Special.xml b/DefInjected/MentalStateDef/MentalStates_Special.xml
index ed71b42d..f4dc92fc 100644
--- a/DefInjected/MentalStateDef/MentalStates_Special.xml
+++ b/DefInjected/MentalStateDef/MentalStates_Special.xml
@@ -27,10 +27,10 @@
   <ManhunterPermanent.recoveryMessage>{0}的搜捕杀戮已经结束。</ManhunterPermanent.recoveryMessage>
   <ManhunterPermanent.baseInspectLine>疯狂：猎杀人类</ManhunterPermanent.baseInspectLine>
 
-  <SocialFighting.label>争执</SocialFighting.label>
-  <SocialFighting.baseInspectLine>失控：争执</SocialFighting.baseInspectLine>
+  <SocialFighting.label>打架</SocialFighting.label>
+  <SocialFighting.baseInspectLine>失控：打架</SocialFighting.baseInspectLine>
 
 
-  <!--确保在动手/不动手的情况下都能够适用-->
+  <!-- SocialFighting 经确认是动手打架 -->
 
 </LanguageData>
diff --git a/Keyed/Menus_Main.xml b/Keyed/Menus_Main.xml
index 0f2f2f2e..3ff2fb03 100644
--- a/Keyed/Menus_Main.xml
+++ b/Keyed/Menus_Main.xml
@@ -128,9 +128,9 @@
 
   <!--=========== Character chooser ==========-->
   <CreateCharacters>创建角色</CreateCharacters>
-  <FirstNameDesc>角色的姓氏。\n\n这只会在部分菜单中显示。</FirstNameDesc>
+  <FirstNameDesc>角色的名字。\n\n这只会在部分菜单中显示。</FirstNameDesc>
   <ShortIdentifierDesc>角色的简称。\n\n这会在所有情况下都显示。可以和姓或者名一样，也可以是一个完全不一样的绰号。</ShortIdentifierDesc>
-  <LastNameDesc>角色的名字。\n\n这只会在部分菜单中显示。</LastNameDesc>
+  <LastNameDesc>角色的姓氏。\n\n这只会在部分菜单中显示。</LastNameDesc>
   <Randomize>随机</Randomize>
   <AgeIndicator>年龄{0}</AgeIndicator>
   <Backstory>背景故事</Backstory>
diff --git a/Keyed/Messages.xml b/Keyed/Messages.xml
index f841eccb..926101f5 100644
--- a/Keyed/Messages.xml
+++ b/Keyed/Messages.xml
@@ -99,7 +99,7 @@
   <MessageCantSelectDeadPawn>{0}已死亡。</MessageCantSelectDeadPawn>
   <MessageCantSelectOffMapPawn>{0}已离开地图了。</MessageCantSelectOffMapPawn>
 
-  <MessageSocialFight>{0}和{1}开始争执起来。原因：{2}。</MessageSocialFight>
+  <MessageSocialFight>{0}和{1}打起来了。原因：{2}。</MessageSocialFight>
 
   <MessageNewMarriageCeremony>殖民者们聚集一堂，准备参加{0}和{1}的婚礼。</MessageNewMarriageCeremony>
   <MessageMarriageCeremonyStarts>{0}和{1}开始举行婚礼庆典！</MessageMarriageCeremonyStarts>
diff --git a/Keyed/Misc_Gameplay.xml b/Keyed/Misc_Gameplay.xml
index ab8ee556..8d061786 100644
--- a/Keyed/Misc_Gameplay.xml
+++ b/Keyed/Misc_Gameplay.xml
@@ -236,8 +236,8 @@
   <ReadyToHarvest>待收获</ReadyToHarvest>
   <Mature>成熟</Mature>
   <SeedLabel>{0}种子</SeedLabel>
-  <OutdoorGrowingPeriod>生长周期：\n{0}</OutdoorGrowingPeriod>
-  <NoGrowingPeriod>永不</NoGrowingPeriod>
+  <OutdoorGrowingPeriod>生长期：\n{0}</OutdoorGrowingPeriod>
+  <NoGrowingPeriod>无</NoGrowingPeriod>
   <GrowYearRound>全年</GrowYearRound>
   <GrowSeasonHereNow>当前季节可种植。</GrowSeasonHereNow>
   <CannotGrowTooCold>无法种植 - 过于寒冷</CannotGrowTooCold>