Merge pull request #345 from VaniatD/master

update 3167

Core/Keyed/Misc_Gameplay.xml

@@ -526,6 +526,10 @@
   <AttackToDestroy>攻击以摧毁它。</AttackToDestroy>
   <!-- EN: Remove this by attacking it. -->
   <RemoveByAttackingTooltip>攻击以消除它。</RemoveByAttackingTooltip>
+  <!-- EN: Food: {0} -->
+  <ThoughtFoodEatenFood>食物：{0}</ThoughtFoodEatenFood><!--text_todo-->
+  <!-- EN: (Ingredients: {0}) -->
+  <ThoughtFoodEatenIngredients>（成分：{0}）</ThoughtFoodEatenIngredients><!--text_todo-->
 
   <!-- Scanning -->
   <!-- EN: User scanning speed -->

Ideology/DefInjected/SpecialThingFilterDef/SpecialThingFilters.xml

@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
+  <!-- EN: allow food with meat -->
+  <AllowCarnivore.label>允许含肉</AllowCarnivore.label>
+  <!-- EN: Allow food that is acceptable to meat eaters but unacceptable to vegetarians. This accounts for food that may be vegetarian or may contain meat depending on its ingredients. -->
+  <AllowCarnivore.description>允许含肉的食物同时禁止纯素食。这取决于食物成分的荤素。</AllowCarnivore.description>
+  
   <!-- EN: allow slave corpses -->
   <AllowCorpsesSlave.label>允许奴隶尸体</AllowCorpsesSlave.label>
   <!-- EN: Allow the dead bodies of slaves. -->
   <AllowCorpsesSlave.description>允许奴隶的尸体。</AllowCorpsesSlave.description>
   
+  <!-- EN: allow vegetarian food -->
+  <AllowVegetarian.label>允许素食</AllowVegetarian.label>
+  <!-- EN: Allow food that is acceptable to vegetarians but unacceptable to those that only eat meat. This accounts for food that may be vegetarian or may contain meat depending on its ingredients. -->
+  <AllowVegetarian.description>允许素食同时禁止含有荤食成分的食物。这取决于食物成分的荤素。</AllowVegetarian.description>
+  
 </LanguageData>

Ideology/Keyed/Dialogs_Various.xml

@@ -319,4 +319,10 @@
   <!-- EN: Relics -->
   <RelicsSection>圣物</RelicsSection>
 
+  <!-- Food restrictions -->
+  <!-- EN: Vegetarian -->
+  <FoodRestrictionVegetarian>素食</FoodRestrictionVegetarian><!--text_todo-->
+  <!-- EN: Carnivore -->
+  <FoodRestrictionCarnivore>荤食</FoodRestrictionCarnivore><!--text_todo-->
+
 </LanguageData>

Ideology/Keyed/FloatMenu.xml

@@ -128,8 +128,8 @@
   <!-- EN: Remove current role -->
   <RemoveCurrentRole>移除当前职位</RemoveCurrentRole>
 
-  <!-- EN: Enter biosculpter pod for {0} cycle -->
-  <EnterBiosculpterPod>进入塑形舱（{0}）</EnterBiosculpterPod>
+  <!-- EN: Enter biosculpter pod for {0} cycle [{1}] -->
+  <EnterBiosculpterPod>进入塑形舱（{0}）[{1}]</EnterBiosculpterPod><!--text_todo-->
   <!-- EN: Biotuned to someone else. -->
   <BiosculpterBiotunedToAnother>进行生体塑形</BiosculpterBiotunedToAnother>
   <!-- EN: Must be {0} years old for age reversal. -->

Ideology/Keyed/Messages.xml

@@ -20,7 +20,7 @@
   <!-- EN: {INITIATOR_nameDef} tried to convert {RECIPIENT_nameDef} to {INITIATOR_possessive} ideoligion. {RECIPIENT_nameDef}'s certainty has fallen from {CERTAINTYBEFORE} to {CERTAINTYAFTER}. {RECIPIENT_pronoun} resents the conversion attempt. -->
   <MessageFailedConvertIdeoAttempt>{INITIATOR_nameDef} 尝试将 {RECIPIENT_nameDef} 转化为 {INITIATOR_possessive} 文化形态。{RECIPIENT_nameDef} 的认可度已从 {CERTAINTYBEFORE} 降至 {CERTAINTYAFTER}。 {RECIPIENT_pronoun} 对转化尝试表示不满。</MessageFailedConvertIdeoAttempt>
   <!-- EN: {PAWN1_nameDef} tried to convert {PAWN2_nameDef} to {PAWN1_possessive} ideoligion. This led to a social fight! -->
-  <MessageFailedConvertIdeoAttemptSocialFight>{PAWN1_nameDef} 试图将 {PAWN2_nameDef} 转化为 {PAWN1_possessive} 文化形态。这导致了社会斗争！</MessageFailedConvertIdeoAttemptSocialFight>
+  <MessageFailedConvertIdeoAttemptSocialFight>{PAWN1_nameDef} 试图将 {PAWN2_nameDef} 转化为 {PAWN1_possessive} 文化形态。这导致了口角！</MessageFailedConvertIdeoAttemptSocialFight>
   <!-- EN: You must choose at least {0} memes. -->
   <MessageNotEnoughMemes>必须至少选择 {0} 个模因。</MessageNotEnoughMemes>
   <!-- EN: You can't choose more than {0} memes. -->

Ideology/Keyed/Misc_Gameplay.xml

@@ -147,6 +147,12 @@
   <ReformDevelopmentPoints>改革所需点数</ReformDevelopmentPoints>
   <!-- EN: quest -->
   <QuestLower>任务</QuestLower>
+  <!-- EN: Vegetarian -->
+  <MealKindVegetarian>素食</MealKindVegetarian><!--text_todo-->
+  <!-- EN: Contains meat -->
+  <MealKindMeat>含肉</MealKindMeat><!--text_todo-->
+  <!-- EN: Acceptable food for everyone -->
+  <MealKindAny>无</MealKindAny><!--text_todo-->
 
   <!-- EN: Could not load ideoligion -->
   <UnableToLoadIdeoTitle>无法载入文化</UnableToLoadIdeoTitle>
@@ -601,12 +607,20 @@
   <BiosculpterPodCycleWillBiotune>（并调谐）</BiosculpterPodCycleWillBiotune>
   <!-- EN: Begin {0} cycle -->
   <BiosculpterPodCycleCommand>开始{0}周期</BiosculpterPodCycleCommand>
+  <!-- EN: Duration: {TIME} -->
+  <BiosculpterPodCycleDuration>持续：{TIME}</BiosculpterPodCycleDuration><!--text_todo-->
+  <!-- EN: Duration (transhumanists): {TIME} -->
+  <BiosculpterPodCycleDurationTranshumanists>持续（技术融合）：{TIME}</BiosculpterPodCycleDurationTranshumanists><!--text_todo-->
   <!-- EN: Ready for cycle selection -->
   <BiosculpterPodCycleSelection>准备进行选择</BiosculpterPodCycleSelection>
+  <!-- EN: On standby for {CYCLE} cycle with {PAWN_labelShort} -->
+  <BiosculpterPodCycleStandby>{PAWN_labelShort}的{CYCLE}周期待机</BiosculpterPodCycleStandby><!--text_todo-->
   <!-- EN: Nutrition loaded, no power -->
   <BiosculpterPodCycleSelectionNoPower>已装载营养，未通电</BiosculpterPodCycleSelectionNoPower>
   <!-- EN: Ends in -->
   <BiosculpterCycleTimeRemaining>结束</BiosculpterCycleTimeRemaining>
+  <!-- EN: (accelerated for transhumanists) -->
+  <BiosculpterCycleAccelerated>（技术融合加速）</BiosculpterCycleAccelerated><!--text_todo-->
   <!-- EN: Paused: No power (interrupt in {TIME}) -->
   <BiosculpterCycleNoPowerInterrupt>暂停：未通电（限期{TIME}）</BiosculpterCycleNoPowerInterrupt>
   <!-- EN: Biotuned to -->