From 067dd3e02d0ec347c789ed480c40d58137d65680 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Fri, 31 Jul 2020 10:05:33 +0800
Subject: [PATCH] update for 2711

---
 Core/DefInjected/ThingDef/Apparel_Packs.xml                 | 2 +-
 Core/Keyed/Menus_Main.xml                                   | 6 +++++-
 Core/LanguageInfo.xml                                       | 2 +-
 .../QuestScriptDef/Script_Hospitality_Refugee.xml           | 4 ++--
 Royalty/DefInjected/ThingDef/Apparel_Packs.xml              | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Core/DefInjected/ThingDef/Apparel_Packs.xml b/Core/DefInjected/ThingDef/Apparel_Packs.xml
index f2a7d673..04aa3820 100644
--- a/Core/DefInjected/ThingDef/Apparel_Packs.xml
+++ b/Core/DefInjected/ThingDef/Apparel_Packs.xml
@@ -4,7 +4,7 @@
   <!-- EN: smokepop pack -->
   <Apparel_SmokepopBelt.label>烟罐包</Apparel_SmokepopBelt.label>
   <!-- EN: A defensive smokescreen. When activated, it will release a cloud of smoke, obscuring incoming shots and preventing turrets from locking on. -->
-  <Apparel_SmokepopBelt.description>一个一次性的自动防御烟幕。一旦穿戴者被子弹击中，会释放出厚厚的烟雾云，提供视线遮挡以及防止被炮塔锁定。</Apparel_SmokepopBelt.description>
+  <Apparel_SmokepopBelt.description>防御性的烟幕装置。当它被激活时，会释放一团烟雾，能够阻挡瞄准，同时防止被炮塔锁定。</Apparel_SmokepopBelt.description>
   <!-- EN: smokepop -->
   <Apparel_SmokepopBelt.comps.CompReloadable.chargeNoun>烟罐</Apparel_SmokepopBelt.comps.CompReloadable.chargeNoun>
   <!-- EN: pop smoke -->
diff --git a/Core/Keyed/Menus_Main.xml b/Core/Keyed/Menus_Main.xml
index e16aa062..0ecbfc13 100644
--- a/Core/Keyed/Menus_Main.xml
+++ b/Core/Keyed/Menus_Main.xml
@@ -204,6 +204,8 @@
   <ModUnsatisfiedDependency>这需要以下MOD才能运行: {0}。</ModUnsatisfiedDependency>
   <!-- EN: This mod was not made for this version of RimWorld, and will probably not work correctly. -->
   <ModNotMadeForThisVersion>该 Mod 并不适配于当前 RimWorld 版本，很可能无法正常运行。</ModNotMadeForThisVersion>
+  <!-- EN: This mod is not made for this version of RimWorld. -->
+  <ModNotMadeForThisVersionShort>该 Mod 并不适配于此版本。</ModNotMadeForThisVersionShort>
   <!-- EN: This mod was made for a newer version of RimWorld than this, and will probably not work correctly. -->
   <ModNotMadeForThisVersion_Newer>该 Mod 是为更高的 RimWorld 版本制作的，很可能无法正常运行。</ModNotMadeForThisVersion_Newer>
   <!-- EN: Mod needs properly formatted supported version information in About.xml. Like this: <supportedVersions><li>{0}</li></supportedVersions> - <targetVersion> is deprecated. Check log for further information. -->
@@ -224,8 +226,10 @@
   <ModLoadFolderOutOfOrder>无效版本顺序：{0} 应该在 {1} 之前。</ModLoadFolderOutOfOrder>
   <!-- EN: Invalid version order: 'default' should be defined first. -->
   <ModLoadFolderOutOfOrderDefault>无效的版本顺序：应该首先定义“default”。</ModLoadFolderOutOfOrderDefault>
+  <!-- EN: Using 'default' in load folders is deprecated. Please define folders for each version using the <v...> tags. -->
+  <ModLoadFolderDefaultDeprecated>不推荐在加载文件中使用默认格式的版本目录。请为每个版本的目录加上类似‘v...’的标签。</ModLoadFolderDefaultDeprecated>
   <!-- EN: Version {0} is defined in load folders, but is not listed in 'supportedVersions' of mod's About.xml. -->
-  <ModLoadFolderDefinesUnsupportedGameVersion>版本 {0} 是在加载文件夹中定义的，但是在mod的About.xml的'supportedGameVersions'中没有列出</ModLoadFolderDefinesUnsupportedGameVersion>
+  <ModLoadFolderDefinesUnsupportedGameVersion>版本 {0} 是在加载文件中定义的，但是在mod的About.xml的'supportedGameVersions'中没有列出</ModLoadFolderDefinesUnsupportedGameVersion>
   <!-- EN: Drag to reorder -->
   <DragToReorder>拖拽以排序</DragToReorder>
 
diff --git a/Core/LanguageInfo.xml b/Core/LanguageInfo.xml
index 9bc340db..da3b95de 100644
--- a/Core/LanguageInfo.xml
+++ b/Core/LanguageInfo.xml
@@ -130,7 +130,7 @@
       <creditee>Indeed</creditee>
     </li>
     <li Class="CreditRecord_Text">
-      <text>修订日期： 2020年7月30日 09点42分</text>
+      <text>修订日期： 2020年7月31日 10点04分</text>
       <anchor>MiddleRight</anchor>
     </li>
   </credits>
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Refugee.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Refugee.xml
index b1832974..3750530b 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Refugee.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Refugee.xml
@@ -242,11 +242,11 @@
   
   <!-- EN:
     <li>rewardLetterLabel->Hospitality reward</li>
-    <li>rewardLetterText->[lodgers0_nameDef] has contacted you. [rewardDelayTicks_duration] ago, you helped [lodgers0_objective] in desperate circumstances.\n\nSince then, [lodgers0_pronoun] has gotten back on [lodgers0_possessive] feet, and now [lodgers0_pronoun] wants to reward you properly for your help. [lodgers0_pronoun] is sending you the following via drop pod:\n\n[listOfRewards]</li>
+    <li>rewardLetterText->[rewardGiver_nameDef] has contacted you. [rewardDelayTicks_duration] ago, you helped [rewardGiver_objective] in desperate circumstances.\n\nSince then, [rewardGiver_pronoun] has gotten back on [rewardGiver_possessive] feet, and now [rewardGiver_pronoun] wants to reward you properly for your help. [rewardGiver_pronoun] is sending you the following via drop pod:\n\n[listOfRewards]</li>
   -->
   <RefugeeDelayedReward.questContentRules.rulesStrings>
     <li>rewardLetterLabel->访客报酬</li>
-    <li>rewardLetterText->[lodgers0_nameDef] 已经联系过你。 [rewardDelayTicks_duration] 之前， 你在[lodgers0_objective]十分绝望的时候给与了帮助。\n\n后来，[lodgers0_pronoun]靠着[lodgers0_possessive]的双腿重新站了起来， 现在 [lodgers0_pronoun] 想要对你的帮助给与得体的报酬。 [lodgers0_pronoun]通过空投舱向你发送了如下物资：\n\n[listOfRewards]</li>
+    <li>rewardLetterText->[rewardGiver_nameDef] 已经联系过你。 [rewardDelayTicks_duration] 之前， 你在[rewardGiver_objective]十分绝望的时候给与了帮助。\n\n后来，[rewardGiver_pronoun]靠着[rewardGiver_possessive]双腿重新站了起来， 现在 [rewardGiver_pronoun] 想要对你的帮助给与得体的报酬。 [rewardGiver_pronoun]通过空投舱向你发送了如下物资：\n\n[listOfRewards]</li>
   </RefugeeDelayedReward.questContentRules.rulesStrings>
   <!-- EN:
     <li>questDescription->a delayed reward for refugee quest</li>
diff --git a/Royalty/DefInjected/ThingDef/Apparel_Packs.xml b/Royalty/DefInjected/ThingDef/Apparel_Packs.xml
index 4c069fab..63e5ef58 100644
--- a/Royalty/DefInjected/ThingDef/Apparel_Packs.xml
+++ b/Royalty/DefInjected/ThingDef/Apparel_Packs.xml
@@ -15,7 +15,7 @@
   <!-- EN: A single-person burst rocket for short-ranged flight. With its integrated harness and guidance assistant, the jump pack allows anyone to leap long distances at high speed, even over obstacles. It must be recharged after several uses.\n\nSome spacer tech militaries have melee combat specialists who use jump packs to bypass obstacles and rapidly close with the enemy. -->
   <Apparel_PackJump.description>装载了单人火箭推进器的背包可以让使用者进行短程飞行。配备有综合安全带和指导助手，跳跃背包能让任何人以高速跨越一段距离，甚至能跨越低矮的障碍物。它必须在使用后重新充能。\n\n一些太空时代的近战专家们会使用跳跃背包迅速穿过掩体接近敌人。</Apparel_PackJump.description>
   <!-- EN: jump -->
-  <Apparel_PackJump.comps.CompReloadable.chargeNoun>跳跃</Apparel_PackJump.comps.CompReloadable.chargeNoun>
+  <Apparel_PackJump.comps.CompReloadable.chargeNoun>燃料罐</Apparel_PackJump.comps.CompReloadable.chargeNoun>
   <!-- EN: jump -->
   <Apparel_PackJump.verbs.jump.label>跳跃</Apparel_PackJump.verbs.jump.label>