Merge remote-tracking branch 'upstream/master'

Core/Keyed/Designators.xml

@@ -197,7 +197,7 @@
   <!-- EN: Identical blueprint already exists here. -->
   <IdenticalBlueprintExists>此处已经存在相同的蓝图。</IdenticalBlueprintExists>
   <!-- EN: {0_label} cannot be built on this terrain. -->
-  <TerrainCannotSupport>此地形无法建造{0_label}。</TerrainCannotSupport>
+  <TerrainCannotSupport>此地形上无法建造{0_label}</TerrainCannotSupport>
   <!-- EN: {0_label} requires terrain that supports: {1_label} -->
   <TerrainCannotSupport_TerrainAffordance>{0_label}需要支持的地形：{1_label}</TerrainCannotSupport_TerrainAffordance>
   <!-- EN: {0_label} (when made of {2_label}) requires terrain that supports: {1_label} -->

Royalty/DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
-  
+
   <!-- EN:
     <li>decreeIntro->[asker_nameDef], your [asker_bestRoyalTitle], has issued a royal decree.</li>
     <li>decreeThreatInfo->If you fail to fulfill this decree within [decreeDays] days, [asker_nameDef] will start to become unhappy. [asker_possessive] anger will increase over time until the decree is satisfied.</li>
@@ -13,8 +13,5 @@
   <DecreeSetup.root.nodes.Delay.node.nodes.Letter.label.slateRef>[asker_nameDef]的法令被遗忘</DecreeSetup.root.nodes.Delay.node.nodes.Letter.label.slateRef>
   <!-- EN: [asker_nameDef] has forgotten about [asker_possessive] decree. -->
   <DecreeSetup.root.nodes.Delay.node.nodes.Letter.text.slateRef>[asker_nameDef]已经遗忘[asker_possessive]法令。</DecreeSetup.root.nodes.Delay.node.nodes.Letter.text.slateRef>
-  
-  <!-- UNUSED -->
-  <DecreeSetup.questDescriptionRules.rulesStrings>你的[asker_bestRoyalTitle]，[asker_nameDef]对一项荣誉法令困惑不已。</DecreeSetup.questDescriptionRules.rulesStrings>
-  
-</LanguageData>
+
+</LanguageData>