Merge pull request #324 from VaniatD/master

update 3107

Core/DefInjected/QuestScriptDef/Scripts_JoinerThreatCore.xml

@@ -36,8 +36,8 @@
     <li>runnerIndef->难民</li>
   </ThreatReward_Raid_Joiner.questNameRules.rulesStrings>
   <!-- EN: {BASELABEL} chasing [../joiner_nameDef] -->
-  <ThreatReward_Raid_Joiner.LetterLabelCashing.value.slateRef>{BASELABEL} 追捕 [../joiner_nameDef]</ThreatReward_Raid_Joiner.LetterLabelCashing.value.slateRef>
+  <ThreatReward_Raid_Joiner.LetterLabelChasing.value.slateRef>{BASELABEL} 追捕 [../joiner_nameDef]</ThreatReward_Raid_Joiner.LetterLabelChasing.value.slateRef>
   <!-- EN: {BASETEXT}\n              \nThe [enemyFaction_pawnsPlural] have come to get [../joiner_nameDef]. -->
-  <ThreatReward_Raid_Joiner.LetterTextCashing.value.slateRef>{BASETEXT}\n\n[enemyFaction_pawnsPlural] 来此追捕 [../joiner_nameDef]。</ThreatReward_Raid_Joiner.LetterTextCashing.value.slateRef>
+  <ThreatReward_Raid_Joiner.LetterTextChasing.value.slateRef>{BASETEXT}\n\n[enemyFaction_pawnsPlural] 来此追捕 [../joiner_nameDef]。</ThreatReward_Raid_Joiner.LetterTextChasing.value.slateRef>
   
 </LanguageData>

Core/DefInjected/WorkTypeDef/WorkTypes.xml

@@ -6,7 +6,7 @@
   <Art.description>艺术家负责用原材料创作出优秀的艺术品。</Art.description>
   <!-- EN: art -->
   <Art.gerundLabel>艺术</Art.gerundLabel>
-  <!-- EN: Art -->
+  <!-- EN: art -->
   <Art.labelShort>艺术</Art.labelShort>
   <!-- EN: Artist -->
   <Art.pawnLabel>艺术家</Art.pawnLabel>
@@ -18,7 +18,7 @@
   <BasicWorker.description>不需要技能的容易的工作。像是释放囚犯和开关电器。</BasicWorker.description>
   <!-- EN: dealing with -->
   <BasicWorker.gerundLabel>处理</BasicWorker.gerundLabel>
-  <!-- EN: Basic -->
+  <!-- EN: basic -->
   <BasicWorker.labelShort>基本</BasicWorker.labelShort>
   <!-- EN: Worker -->
   <BasicWorker.pawnLabel>工人</BasicWorker.pawnLabel>
@@ -30,7 +30,7 @@
   <Cleaning.description>清洁工负责清理居住区的污渍、清除除雪区的积雪。</Cleaning.description>
   <!-- EN: cleaning -->
   <Cleaning.gerundLabel>清洁</Cleaning.gerundLabel>
-  <!-- EN: Clean -->
+  <!-- EN: clean -->
   <Cleaning.labelShort>清洁</Cleaning.labelShort>
   <!-- EN: Cleaner -->
   <Cleaning.pawnLabel>清洁工</Cleaning.pawnLabel>
@@ -42,7 +42,7 @@
   <Construction.description>建造者会建造你指定的建筑，并修理损坏的建筑、家具、工作台等。</Construction.description>
   <!-- EN: constructing -->
   <Construction.gerundLabel>建造</Construction.gerundLabel>
-  <!-- EN: Construct -->
+  <!-- EN: construct -->
   <Construction.labelShort>建造</Construction.labelShort>
   <!-- EN: Constructor -->
   <Construction.pawnLabel>建造者</Construction.pawnLabel>
@@ -54,7 +54,7 @@
   <Cooking.description>厨师负责烹饪食物、屠宰尸体、填充储料器。</Cooking.description>
   <!-- EN: cooking -->
   <Cooking.gerundLabel>烹饪</Cooking.gerundLabel>
-  <!-- EN: Cook -->
+  <!-- EN: cook -->
   <Cooking.labelShort>烹饪</Cooking.labelShort>
   <!-- EN: Cook -->
   <Cooking.pawnLabel>厨师</Cooking.pawnLabel>
@@ -66,7 +66,7 @@
   <Crafting.description>工匠负责把原材料制成成品。</Crafting.description>
   <!-- EN: crafting -->
   <Crafting.gerundLabel>制作</Crafting.gerundLabel>
-  <!-- EN: Craft -->
+  <!-- EN: craft -->
   <Crafting.labelShort>制作</Crafting.labelShort>
   <!-- EN: Crafter -->
   <Crafting.pawnLabel>工匠</Crafting.pawnLabel>
@@ -78,7 +78,7 @@
   <Doctor.description>医生负责治疗病人和伤员、给无法行动的人喂食、进行手术。医生会同时照顾殖民者和囚犯。</Doctor.description>
   <!-- EN: doctoring -->
   <Doctor.gerundLabel>医生</Doctor.gerundLabel>
-  <!-- EN: Doctor -->
+  <!-- EN: doctor -->
   <Doctor.labelShort>医生</Doctor.labelShort>
   <!-- EN: Doctor -->
   <Doctor.pawnLabel>医生</Doctor.pawnLabel>
@@ -90,7 +90,7 @@
   <Firefighter.description>扑灭居住区内的火灾。</Firefighter.description>
   <!-- EN: firefighting -->
   <Firefighter.gerundLabel>灭火</Firefighter.gerundLabel>
-  <!-- EN: Firefight -->
+  <!-- EN: firefight -->
   <Firefighter.labelShort>灭火</Firefighter.labelShort>
   <!-- EN: Firefighter -->
   <Firefighter.pawnLabel>消防员</Firefighter.pawnLabel>
@@ -102,7 +102,7 @@
   <Growing.description>种植者负责管理种植区、花盆和水栽培植物盆，种植或收获作物。</Growing.description>
   <!-- EN: growing -->
   <Growing.gerundLabel>种植</Growing.gerundLabel>
-  <!-- EN: Grow -->
+  <!-- EN: grow -->
   <Growing.labelShort>种植</Growing.labelShort>
   <!-- EN: Grower -->
   <Growing.pawnLabel>种植者</Growing.pawnLabel>
@@ -114,7 +114,7 @@
   <Handling.description>驯兽师负责驯服野生动物、训练已驯服的动物、收获畜产品、宰杀已驯服的动物。</Handling.description>
   <!-- EN: handling -->
   <Handling.gerundLabel>驯兽</Handling.gerundLabel>
-  <!-- EN: Handle -->
+  <!-- EN: handle -->
   <Handling.labelShort>驯兽</Handling.labelShort>
   <!-- EN: Handler -->
   <Handling.pawnLabel>驯兽员</Handling.pawnLabel>
@@ -126,7 +126,7 @@
   <Hauling.description>搬运工负责把物品运送到目的地。</Hauling.description>
   <!-- EN: hauling -->
   <Hauling.gerundLabel>搬运</Hauling.gerundLabel>
-  <!-- EN: Haul -->
+  <!-- EN: haul -->
   <Hauling.labelShort>搬运</Hauling.labelShort>
   <!-- EN: Hauler -->
   <Hauling.pawnLabel>搬运工</Hauling.pawnLabel>
@@ -138,7 +138,7 @@
   <Hunting.description>猎人负责狩猎你指定的野生动物。</Hunting.description>
   <!-- EN: hunting -->
   <Hunting.gerundLabel>狩猎</Hunting.gerundLabel>
-  <!-- EN: Hunt -->
+  <!-- EN: hunt -->
   <Hunting.labelShort>狩猎</Hunting.labelShort>
   <!-- EN: Hunter -->
   <Hunting.pawnLabel>猎人</Hunting.pawnLabel>
@@ -150,7 +150,7 @@
   <Mining.description>挖掘与钻取。</Mining.description>
   <!-- EN: mining -->
   <Mining.gerundLabel>开采</Mining.gerundLabel>
-  <!-- EN: Mine -->
+  <!-- EN: mine -->
   <Mining.labelShort>采矿</Mining.labelShort>
   <!-- EN: Miner -->
   <Mining.pawnLabel>矿工</Mining.pawnLabel>
@@ -162,7 +162,7 @@
   <Patient.description>当有危及生命的健康状况时，躺到医疗床上接受治疗。</Patient.description>
   <!-- EN: patienting -->
   <Patient.gerundLabel>就医</Patient.gerundLabel>
-  <!-- EN: Patient -->
+  <!-- EN: patient -->
   <Patient.labelShort>就医</Patient.labelShort>
   <!-- EN: Patient -->
   <Patient.pawnLabel>病人</Patient.pawnLabel>
@@ -174,7 +174,7 @@
   <PatientBedRest.description>非致命的疾病可以通过卧床休养得到恢复。</PatientBedRest.description>
   <!-- EN: resting in bed -->
   <PatientBedRest.gerundLabel>休养</PatientBedRest.gerundLabel>
-  <!-- EN: Bed rest -->
+  <!-- EN: bed rest -->
   <PatientBedRest.labelShort>休养</PatientBedRest.labelShort>
   <!-- EN: Bed rester -->
   <PatientBedRest.pawnLabel>病人</PatientBedRest.pawnLabel>
@@ -186,7 +186,7 @@
   <PlantCutting.description>收割者负责割除并收获你标记的植物，砍伐你标记的树木。</PlantCutting.description>
   <!-- EN: plant cutting -->
   <PlantCutting.gerundLabel>割除</PlantCutting.gerundLabel>
-  <!-- EN: Plant cut -->
+  <!-- EN: plant cut -->
   <PlantCutting.labelShort>割除</PlantCutting.labelShort>
   <!-- EN: Plant cutter -->
   <PlantCutting.pawnLabel>收割者</PlantCutting.pawnLabel>
@@ -198,7 +198,7 @@
   <Research.description>研究员负责研究工作。因为研究是一项长期工作，专门的研究员需要降低其他工作的优先度。</Research.description>
   <!-- EN: researching -->
   <Research.gerundLabel>研究</Research.gerundLabel>
-  <!-- EN: Research -->
+  <!-- EN: research -->
   <Research.labelShort>研究</Research.labelShort>
   <!-- EN: Researcher -->
   <Research.pawnLabel>研究员</Research.pawnLabel>
@@ -210,7 +210,7 @@
   <Smithing.description>铁匠负责将原材料锻造成武器和工具。</Smithing.description>
   <!-- EN: smithing -->
   <Smithing.gerundLabel>锻造</Smithing.gerundLabel>
-  <!-- EN: Smith -->
+  <!-- EN: smith -->
   <Smithing.labelShort>锻造</Smithing.labelShort>
   <!-- EN: Smith -->
   <Smithing.pawnLabel>铁匠</Smithing.pawnLabel>
@@ -222,7 +222,7 @@
   <Tailoring.description>裁缝负责将原材料缝制成衣物。</Tailoring.description>
   <!-- EN: tailoring -->
   <Tailoring.gerundLabel>缝制</Tailoring.gerundLabel>
-  <!-- EN: Tailor -->
+  <!-- EN: tailor -->
   <Tailoring.labelShort>缝制</Tailoring.labelShort>
   <!-- EN: Tailor -->
   <Tailoring.pawnLabel>裁缝</Tailoring.pawnLabel>
@@ -234,7 +234,7 @@
   <Warden.description>狱卒负责给囚犯送餐、和囚犯聊天、招募、殴打或是处决囚犯。需要在「囚犯」菜单内选择对应的选项。</Warden.description>
   <!-- EN: wardening -->
   <Warden.gerundLabel>监管</Warden.gerundLabel>
-  <!-- EN: Warden -->
+  <!-- EN: warden -->
   <Warden.labelShort>监管</Warden.labelShort>
   <!-- EN: Warden -->
   <Warden.pawnLabel>狱卒</Warden.pawnLabel>

Ideology/Keyed/Alerts.xml

@@ -19,6 +19,8 @@
 
   <!-- EN: {0} expected -->
   <RitualExpected>{0}</RitualExpected>
+  <!-- EN: {0} opportunity -->
+  <RitualOpportunity>{0}</RitualOpportunity>
   <!-- EN: {0} expected for -->
   <RitualExpectedFor>{0}</RitualExpectedFor>
   <!-- EN: {0} days: Ritual opportunity ends. -->
@@ -63,8 +65,8 @@
   <IdeoRoleEmpty>{0}职位未被分配</IdeoRoleEmpty>
   <!-- EN: {0} roles unfilled -->
   <IdeoRolesEmpty>{0}职位未被分配</IdeoRolesEmpty>
-  <!-- EN: These roles are not filled:\n{0}\n\nYou can assign someone a role by performing a role change ritual. Select a ritual spot or an altar and click 'Begin role change'.\n\nIf these roles remain empty, the following people will be unhappy -->
-  <IdeoRolesEmptyDesc>职位未被分配：\n{0}\n\n你可以通过职位变更仪式为某人指定一个职位，选择一个仪式举办点或者祭坛并点击「开始职位变更」。\n\n如果职位仍未被分配，以下人员将不开心</IdeoRolesEmptyDesc>
+  <!-- EN: These roles are not filled:\n{0}\n\nYou can assign someone a role on their Social tab. You can also select a ritual spot or an altar and click 'Begin role change'. \n\nIf these roles remain empty, the following people will be unhappy -->
+  <IdeoRolesEmptyDesc>职位未被分配：\n{0}\n\n你可以通过职位变更仪式为某人指定一个职位，在「社交」选项卡指定职位，或者选择一个仪式举办点/祭坛并点击「开始职位变更」。\n\n如果职位仍未被分配，以下人员将不开心</IdeoRolesEmptyDesc> <!-- text_todo -->
 
   <!-- EN: Security threats activated in {0} -->
   <AncientAltarThreatsWaking>安全协议将在{0}内激活</AncientAltarThreatsWaking>

Ideology/Keyed/Dialogs_Various.xml

@@ -151,8 +151,8 @@
   <CannotAssignBedToColonist>殖民者</CannotAssignBedToColonist>
   <!-- EN: Any slave -->
   <AnySlave>任何奴隶</AnySlave>
-  <!-- EN: Negotiator will not sell people into slavery. -->
-  <NegotiatorWillNotTradeSlaves>谈判者不会把人卖为奴隶。</NegotiatorWillNotTradeSlaves>
+  <!-- EN: {0_nameDef} refuses to sell people into slavery according to his beliefs. -->
+  <NegotiatorWillNotTradeSlaves>{0_nameDef}的信仰拒绝将人作为奴隶出售。</NegotiatorWillNotTradeSlaves> <!-- text_todo -->
   <!-- EN: The negotiator, {0_nameDef}, will not people into slavery due to {0_possessive} belief in {1}.\n\nNote that {0_nameDef} is willing to ransom someone back to their own faction, but isn't willing to sell someone to a different faction. -->
   <NegotiatorWillNotTradeSlavesTip>谈判者 {0_nameDef} 不会因为{0_possessive}对{1}的信仰而使人们沦为奴隶。\n\n注意，{0_nameDef} 愿意将某人赎回自己的派系，但不愿意把他人贩卖到别的派系。</NegotiatorWillNotTradeSlavesTip>