Merge pull request #242 from VaniatD/master

1.3 typosfix 7#

Core/DefInjected/ChemicalDef/Smokeleaf.xml

@@ -2,6 +2,6 @@
 <LanguageData>
   
   <!-- EN: Smokeleaf -->
-  <Smokeleaf.label>烟叶</Smokeleaf.label>
+  <Smokeleaf.label>大麻</Smokeleaf.label>
   
 </LanguageData>

Core/DefInjected/HediffDef/Psychite_Yayo.xml

@@ -22,7 +22,7 @@
   <!-- EN: high on yayo -->
   <YayoHigh.label>呀呦粉亢奋</YayoHigh.label>
   <!-- EN: Active yayo in the bloodstream. Generates an intense euphoric high. -->
-  <YayoHigh.description>流淌在血液里的烟叶化合物能产生一种虚幻的快感。</YayoHigh.description>
+  <YayoHigh.description>流淌在血液里的呀呦化合物能产生一种虚幻的快感。</YayoHigh.description>
   <!-- EN: a yayo high -->
   <YayoHigh.labelNoun>呀呦粉亢奋</YayoHigh.labelNoun>
   

Core/DefInjected/HediffDef/Smokeleaf.xml

@@ -2,23 +2,23 @@
 <LanguageData>
   
   <!-- EN: smokeleaf dependence -->
-  <SmokeleafAddiction.label>烟叶成瘾</SmokeleafAddiction.label>
+  <SmokeleafAddiction.label>大麻成瘾</SmokeleafAddiction.label>
   <!-- EN: A chemical addiction to smokeleaf. Long-term use of smokeleaf has caused neurological adaptations at the cellular level, so the brain can no longer function properly without the drug.\n\nWithout regular doses of smokeleaf, withdrawal symptoms will begin. However, extended abstinence will force the brain to adapt back to its normal state, resolving the addiction. -->
-  <SmokeleafAddiction.description>长期过量的摄取烟叶已经造成了神经系统的适应。\n\n如果没有定期摄取合适剂量的烟叶，戒断反应就会开始。长时间的戒断会迫使大脑适应并恢复到正常状态，从而戒除烟叶成瘾。</SmokeleafAddiction.description>
+  <SmokeleafAddiction.description>长期过量的摄取大麻已经造成了神经系统的适应。\n\n如果没有定期摄取合适剂量的大麻，戒断反应就会开始。长时间的戒断会迫使大脑适应并恢复到正常状态，从而戒除大麻成瘾。</SmokeleafAddiction.description>
   <!-- EN: withdrawal -->
   <SmokeleafAddiction.stages.withdrawal.label>戒断反应</SmokeleafAddiction.stages.withdrawal.label>
   
   <!-- EN: stoned on smokeleaf -->
-  <SmokeleafHigh.label>烟叶沉醉</SmokeleafHigh.label>
+  <SmokeleafHigh.label>大麻沉醉</SmokeleafHigh.label>
   <!-- EN: Smokeleaf's active chemical in the bloodstream. Generates a soft feeling of fuzzy well-being. -->
-  <SmokeleafHigh.description>流淌在血液里的烟叶化合物能产生一种柔软的幸福感。</SmokeleafHigh.description>
+  <SmokeleafHigh.description>流淌在血液里的大麻化合物能产生一种柔软的幸福感。</SmokeleafHigh.description>
   <!-- EN: a smokeleaf high -->
-  <SmokeleafHigh.labelNoun>烟叶沉醉</SmokeleafHigh.labelNoun>
+  <SmokeleafHigh.labelNoun>大麻沉醉</SmokeleafHigh.labelNoun>
   
   <!-- EN: smokeleaf tolerance -->
-  <SmokeleafTolerance.label>烟叶耐受</SmokeleafTolerance.label>
+  <SmokeleafTolerance.label>大麻耐受</SmokeleafTolerance.label>
   <!-- EN: A built-up tolerance to smokeleaf. The more severe this tolerance is, the more smokeleaf it takes to get the same effect. -->
-  <SmokeleafTolerance.description>对烟叶的长期耐受性。耐受性越严重，想达到和之前同样的效果所需要的烟叶也就越多。</SmokeleafTolerance.description>
+  <SmokeleafTolerance.description>对大麻的长期耐受性。耐受性越严重，想达到和之前同样的效果所需要的大麻也就越多。</SmokeleafTolerance.description>
   <!-- EN: small -->
   <SmokeleafTolerance.stages.small.label>弱</SmokeleafTolerance.stages.small.label>
   <!-- EN: large -->

Core/DefInjected/NeedDef/Smokeleaf.xml

@@ -2,8 +2,8 @@
 <LanguageData>
   
   <!-- EN: smokeleaf -->
-  <Chemical_Smokeleaf.label>烟叶</Chemical_Smokeleaf.label>
+  <Chemical_Smokeleaf.label>大麻</Chemical_Smokeleaf.label>
   <!-- EN: Because of a smokeleaf dependence, this person needs to regularly consume the drug to avoid withdrawal symptoms. -->
-  <Chemical_Smokeleaf.description>由于烟叶成瘾，此人需要持续服用成瘾品以避免产生戒断反应。</Chemical_Smokeleaf.description>
+  <Chemical_Smokeleaf.description>由于大麻成瘾，此人需要持续服用成瘾品以避免产生戒断反应。</Chemical_Smokeleaf.description>
   
 </LanguageData>

Core/DefInjected/RecipeDef/ImpliedDefs.xml

@@ -31,10 +31,10 @@
   <!-- EN: 正在施用佩诺西林。 -->
   <Administer_Penoxycyline.jobString>正在施用佩诺西林。</Administer_Penoxycyline.jobString>
   
-  <!-- EN: 施用卷烟 -->
+  <!-- EN: 施用大麻烟 -->
-  <Administer_SmokeleafJoint.label>施用卷烟</Administer_SmokeleafJoint.label>
+  <Administer_SmokeleafJoint.label>施用大麻烟</Administer_SmokeleafJoint.label>
-  <!-- EN: 正在施用卷烟。 -->
+  <!-- EN: 正在施用大麻烟。 -->
-  <Administer_SmokeleafJoint.jobString>正在施用卷烟。</Administer_SmokeleafJoint.jobString>
+  <Administer_SmokeleafJoint.jobString>正在施用大麻烟。</Administer_SmokeleafJoint.jobString>
   
   <!-- EN: 施用清醒丸 -->
   <Administer_WakeUp.label>施用清醒丸</Administer_WakeUp.label>
@@ -529,12 +529,12 @@
   <!-- EN: 正在制作假腿。 -->
   <Make_SimpleProstheticLeg.jobString>正在制作假腿。</Make_SimpleProstheticLeg.jobString>
   
-  <!-- EN: 制作卷烟 -->
+  <!-- EN: 制作大麻烟 -->
-  <Make_SmokeleafJoint.label>制作卷烟</Make_SmokeleafJoint.label>
+  <Make_SmokeleafJoint.label>制作大麻烟</Make_SmokeleafJoint.label>
-  <!-- EN: 制作卷烟。 -->
+  <!-- EN: 制作大麻烟。 -->
-  <Make_SmokeleafJoint.description>制作卷烟。</Make_SmokeleafJoint.description>
+  <Make_SmokeleafJoint.description>制作大麻烟。</Make_SmokeleafJoint.description>
-  <!-- EN: 正在制作卷烟。 -->
+  <!-- EN: 正在制作大麻烟。 -->
-  <Make_SmokeleafJoint.jobString>正在制作卷烟。</Make_SmokeleafJoint.jobString>
+  <Make_SmokeleafJoint.jobString>正在制作大麻烟。</Make_SmokeleafJoint.jobString>
   
   <!-- EN: 制作清醒丸 -->
   <Make_WakeUp.label>制作清醒丸</Make_WakeUp.label>

Core/DefInjected/StatDef/Stats_Pawns_WorkRecipes.xml

@@ -29,7 +29,7 @@
   <!-- EN: drug cooking speed -->
   <DrugCookingSpeed.label>酿酒速度</DrugCookingSpeed.label>
   <!-- EN: The speed at which this person brews beer and tea, or makes simple drug products like smokeleaf joints. -->
-  <DrugCookingSpeed.description>酿造啤酒和制作简单成瘾品，如卷烟时的速度。</DrugCookingSpeed.description>
+  <DrugCookingSpeed.description>酿造啤酒和制作简单成瘾品，如大麻烟时的速度。</DrugCookingSpeed.description>
   
   <!-- EN: drug synthesis speed -->
   <DrugSynthesisSpeed.label>制药速度</DrugSynthesisSpeed.label>

Core/DefInjected/ThingDef/Buildings_Production.xml

@@ -19,7 +19,7 @@
   <!-- EN: crafting spot -->
   <CraftingSpot.label>手工加工点</CraftingSpot.label>
   <!-- EN: A place for crafting simple items like knives or bows. Production here is slow because of the lack of tools. -->
-  <CraftingSpot.description>一个制作简单物品的地方，比如卷烟、匕首和短弓。</CraftingSpot.description>
+  <CraftingSpot.description>一个制作简单物品的地方，比如大麻烟、匕首和短弓。</CraftingSpot.description>
   
   <!-- EN: deep drill -->
   <DeepDrill.label>深钻井</DeepDrill.label>

Core/DefInjected/ThingDef/ImpliedDefs.xml

@@ -1007,8 +1007,8 @@
   
   <!-- EN: 手工加工点（建造中） -->
   <Frame_CraftingSpot.label>手工加工点（建造中）</Frame_CraftingSpot.label>
-  <!-- EN: 一个制作简单物品的地方，比如卷烟、匕首和短弓。 -->
+  <!-- EN: 一个制作简单物品的地方，比如大麻烟、匕首和短弓。 -->
-  <Frame_CraftingSpot.description>一个制作简单物品的地方，比如卷烟、匕首和短弓。</Frame_CraftingSpot.description>
+  <Frame_CraftingSpot.description>一个制作简单物品的地方，比如大麻烟、匕首和短弓。</Frame_CraftingSpot.description>
   
   <!-- EN: 低温休眠舱（建造中） -->
   <Frame_CryptosleepCasket.label>低温休眠舱（建造中）</Frame_CryptosleepCasket.label>

Core/DefInjected/ThingDef/Items_Resource_RawPlant.xml

@@ -47,8 +47,8 @@
   <RawRice.description>生稻米。生吃味道很差。</RawRice.description>
   
   <!-- EN: smokeleaf leaves -->
-  <SmokeleafLeaves.label>烟叶</SmokeleafLeaves.label>
+  <SmokeleafLeaves.label>大麻叶</SmokeleafLeaves.label>
   <!-- EN: Raw cut leaves of a smokeleaf plant. Can be rolled into smokeable joints at a crafting spot. -->
-  <SmokeleafLeaves.description>从烟叶上收获的新鲜叶子，可以在手工加工点处被制成卷烟。</SmokeleafLeaves.description>
+  <SmokeleafLeaves.description>从大麻上收获的新鲜叶子，可以在手工加工点处被制成大麻烟。</SmokeleafLeaves.description>
   
 </LanguageData>

Core/DefInjected/ThingDef/Plants_Cultivated_Farm.xml

@@ -39,7 +39,7 @@
   <!-- EN: psychoid plant -->
   <Plant_Psychoid.label>精神叶</Plant_Psychoid.label>
   <!-- EN: A leafy plant which generates the chemical compound psychite. Originally evolved as a defense mechanism to ward off plant-eating animals by overstimulating and sickening them, the psychite drug can be extracted and refined into various forms for recreational use. It is addictive. -->
-  <Plant_Psychoid.description>一种多叶植物，叶子可以被精炼制成多种精神药物。</Plant_Psychoid.description>
+  <Plant_Psychoid.description>一种多叶植物，能提取影响神经系统的化合物。精神药物最初是作为一种防御机制而进化的，通过过度刺激和恶心它们来抵御吃植物的动物，精神药物可以被提取和提炼成各种形式的娱乐用途。它是令人上瘾的。</Plant_Psychoid.description>
   
   <!-- EN: rice plant -->
   <Plant_Rice.label>水稻</Plant_Rice.label>
@@ -47,9 +47,9 @@
   <Plant_Rice.description>一种低矮的谷类植物，肥沃的土壤中茁壮成长，产出粮食很快，但不煮熟的话不好吃。</Plant_Rice.description>
   
   <!-- EN: smokeleaf plant -->
-  <Plant_Smokeleaf.label>烟叶</Plant_Smokeleaf.label>
+  <Plant_Smokeleaf.label>大麻叶</Plant_Smokeleaf.label>
   <!-- EN: A leafy crop grown for the psychological effects of chemicals in its leaves. Smokeleaf leaves can be prepared into joints at the crafting spot. Smokeleaf makes a user feel relaxed, but reduces motivation, and can be addictive. -->
-  <Plant_Smokeleaf.description>一种多叶植物，烟叶可以在手工加工点处被制成卷烟。</Plant_Smokeleaf.description>
+  <Plant_Smokeleaf.description>一种因其叶子中的化学物质能够产生精神作用而种植的叶类作物。大麻的叶子可以在手工加工点制作成大麻烟。大麻使使用者感到放松，但会降低积极性，并可能会上瘾。</Plant_Smokeleaf.description>
   
   <!-- EN: strawberry plant -->
   <Plant_Strawberry.label>草莓</Plant_Strawberry.label>

Core/DefInjected/ThingDef/Smokeleaf.xml

@@ -2,9 +2,9 @@
 <LanguageData>
   
   <!-- EN: smokeleaf joint -->
-  <SmokeleafJoint.label>卷烟</SmokeleafJoint.label>
+  <SmokeleafJoint.label>大麻烟</SmokeleafJoint.label>
   <!-- EN: Smokeleaf leaves prepared in small rolls for smoking. The drug improves mood, but also increases appetite, reduces focus and slows movement. Smokeleaf use can produce a dependency.\n\nJoints can be produced at a crafting spot without equipment, and are a fixture in many traditional low-industriousness cultures. -->
-  <SmokeleafJoint.description>烟叶卷成的卷烟。这种卷烟会让人兴奋，但是也会成瘾，减缓使用者的注意力和行动速度，长期使用会产生药物依赖。\n\n卷烟不需要任何工具就能够在手工加工点制作，同时也是传统的低工业文明的固定消遣。</SmokeleafJoint.description>
+  <SmokeleafJoint.description>大麻卷成的大麻烟。这种大麻烟会让人兴奋，但是也会成瘾，减缓使用者的注意力和行动速度，长期使用会产生药物依赖。\n\n大麻烟不需要任何工具就能够在手工加工点制作，同时也是传统的低工业文明的固定消遣。</SmokeleafJoint.description>
   <!-- EN: Smoke {0} -->
   <SmokeleafJoint.ingestible.ingestCommandString>吸{0}</SmokeleafJoint.ingestible.ingestCommandString>
   <!-- EN: Smoking {0}. -->

Core/DefInjected/ThoughtDef/Smokeleaf.xml

@@ -2,12 +2,12 @@
 <LanguageData>
   
   <!-- EN: high on smokeleaf -->
-  <SmokeleafHigh.stages.high_on_smokeleaf.label>烟叶亢奋</SmokeleafHigh.stages.high_on_smokeleaf.label>
+  <SmokeleafHigh.stages.high_on_smokeleaf.label>大麻亢奋</SmokeleafHigh.stages.high_on_smokeleaf.label>
   <!-- EN: I'm, like, stoned, man. -->
   <SmokeleafHigh.stages.high_on_smokeleaf.description>嗯，感觉不错，你说什么？</SmokeleafHigh.stages.high_on_smokeleaf.description>
   
   <!-- EN: smokeleaf withdrawal -->
-  <SmokeleafWithdrawal.stages.smokeleaf_withdrawal.label>烟叶戒断</SmokeleafWithdrawal.stages.smokeleaf_withdrawal.label>
+  <SmokeleafWithdrawal.stages.smokeleaf_withdrawal.label>大麻戒断</SmokeleafWithdrawal.stages.smokeleaf_withdrawal.label>
   <!-- EN: I really wish I could smoke. I feel jittery, and my gut has that anxious sensation all the time. -->
   <SmokeleafWithdrawal.stages.smokeleaf_withdrawal.description>好难受，好想再抽一口……</SmokeleafWithdrawal.stages.smokeleaf_withdrawal.description>
   

Core/Strings/Words/Nouns/TalkTopics_Light.txt

@@ -405,7 +405,7 @@
 燃料
 燃料储备
 酿酒
-制作卷烟
+制作大麻烟
 制作成瘾品
 制造医药
 种植草药
@@ -503,7 +503,7 @@ RimWorld最新版本
 大减价
 浴巾
 喝精神茶
-抽卷烟
+抽大麻烟
 喝酒
 吃仙馐果
 服用活力水