From 09e450868fde05f400047df080c2e30152b2b3ac Mon Sep 17 00:00:00 2001
From: AlyxMS <alyxms@live.com>
Date: Sun, 8 Jun 2014 13:25:24 +0800
Subject: [PATCH] 0.4.466 Alpha 4f Update

---
 DefInjected/JobDef/BaseJobDefs.xml            | 2 +-
 DefInjected/RecipeDef/Recipes_Production.xml  | 2 ++
 DefInjected/ThingDef/Buildings_Production.xml | 4 ++++
 DefInjected/ThingDef/Buildings_Structure.xml  | 2 +-
 DefInjected/ThingDef/Items_Resources.xml      | 4 ++++
 DefInjected/WorkGiverDef/BaseWorkGivers.xml   | 4 ++++
 Keyed/FloatMenu.xml                           | 4 ++--
 Keyed/Gameplay.xml                            | 2 +-
 Keyed/Menus_Main.xml                          | 2 +-
 README.txt                                    | 2 +-
 10 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/DefInjected/JobDef/BaseJobDefs.xml b/DefInjected/JobDef/BaseJobDefs.xml
index 47a2bd07..6b7ef634 100644
--- a/DefInjected/JobDef/BaseJobDefs.xml
+++ b/DefInjected/JobDef/BaseJobDefs.xml
@@ -33,7 +33,7 @@
 	
 	<PlaceNoCostFrame.reportString>正在建造TargetA。</PlaceNoCostFrame.reportString>
 	
-	<DoBill.reportString>正在做TargetA清单上的内容。</DoBill.reportString>
+	<DoBill.reportString>正在做TargetA的清单上的内容。</DoBill.reportString>
 	
 	<Rescue.reportString>正在援救TargetA。</Rescue.reportString>
 	
diff --git a/DefInjected/RecipeDef/Recipes_Production.xml b/DefInjected/RecipeDef/Recipes_Production.xml
index c67e4552..a6f593ea 100644
--- a/DefInjected/RecipeDef/Recipes_Production.xml
+++ b/DefInjected/RecipeDef/Recipes_Production.xml
@@ -9,9 +9,11 @@
         <MakeWoodPlanks_Hand.description>手工把10跟原木切成25块木板，速度很慢。</MakeWoodPlanks_Hand.description>
         <MakeWoodPlanks_Hand.jobString>正在制作木板。</MakeWoodPlanks_Hand.jobString>
 		
+		<!--
 		<MakeWoodPlanks_Electric.label>制作木板</MakeWoodPlanks_Electric.label>
         <MakeWoodPlanks_Electric.description>把10跟原木切成25块木板。</MakeWoodPlanks_Electric.description>
         <MakeWoodPlanks_Electric.jobString>正在制作木板。</MakeWoodPlanks_Electric.jobString>
+		-->
 		
 		<ExtractMetalFromSlag.label>从废墟中提取金属</ExtractMetalFromSlag.label>
         <ExtractMetalFromSlag.description>用强热和电磁铁把有用的金属从金属废墟中提取出来。</ExtractMetalFromSlag.description>
diff --git a/DefInjected/ThingDef/Buildings_Production.xml b/DefInjected/ThingDef/Buildings_Production.xml
index 76962f68..cd3520fc 100644
--- a/DefInjected/ThingDef/Buildings_Production.xml
+++ b/DefInjected/ThingDef/Buildings_Production.xml
@@ -7,10 +7,14 @@
         <Hopper.description>为营养膏分配机这样的大型机器储存原料。</Hopper.description>
 		
 		<!-- ========================= Work tables ==========================-->
+		
+		<!--
 		<TableSawmillHand.label>手工锯木机</TableSawmillHand.label>
 		<TableSawmillHand.description>一个用来把原木切成木板的锯木装置，动力来源于肌肉。</TableSawmillHand.description>
 		<TableSawmillElectric.label>电动锯木机</TableSawmillElectric.label>
 		<TableSawmillElectric.description>一个用来把原木切成木板的电动锯木装置。</TableSawmillElectric.description>
+		-->
+		
 		<TableButcher.label>屠宰桌</TableButcher.label>
 		<TableButcher.description>一个用来把死掉的动物宰成肉块的重型桌子。</TableButcher.description>
 		<TableMachining.label>机械加工桌</TableMachining.label>
diff --git a/DefInjected/ThingDef/Buildings_Structure.xml b/DefInjected/ThingDef/Buildings_Structure.xml
index adf6338c..4c372506 100644
--- a/DefInjected/ThingDef/Buildings_Structure.xml
+++ b/DefInjected/ThingDef/Buildings_Structure.xml
@@ -8,7 +8,7 @@
 		
 		<!--========================= Walls =============================-->
 		<WallLog.label>原木墙</WallLog.label>
-        <WallLog.description>一堆原木堆成的墙。很坚韧并建造迅速，但是很易燃而且会消耗大量原木。</WallLog.description>
+        <WallLog.description>一堆原木堆成的墙。很坚韧并建造迅速，但是很易燃而且不能传输电力。</WallLog.description>
 		<WallWood.label>木制墙</WallWood.label>
         <WallWood.description>用木板做成的内置电缆的墙。既便宜建造起来也很快，但是很脆弱并且易燃。</WallWood.description>
         <WallMetal.label>金属墙</WallMetal.label>
diff --git a/DefInjected/ThingDef/Items_Resources.xml b/DefInjected/ThingDef/Items_Resources.xml
index df4fb5f6..2a8f032d 100644
--- a/DefInjected/ThingDef/Items_Resources.xml
+++ b/DefInjected/ThingDef/Items_Resources.xml
@@ -10,10 +10,14 @@
 		<Metal.description>用来建造建筑。</Metal.description>
         <StoneBlocks.label>石块</StoneBlocks.label>
 		<StoneBlocks.description>用来建造建筑。</StoneBlocks.description>
+		<WoodLog.label>木头</WoodLog.label>
+		
+		<!--
 		<WoodLog.label>原木</WoodLog.label>
 		<WoodLog.description>用来建造建筑，可以切成木板。</WoodLog.description>
 		<WoodPlank.label>木板</WoodPlank.label>
 		<WoodPlank.description>用来建造建筑。</WoodPlank.description>
+		-->
 		
 		<!--=============== Raw foods ====================-->
         <RawPotatoes.label>土豆</RawPotatoes.label>
diff --git a/DefInjected/WorkGiverDef/BaseWorkGivers.xml b/DefInjected/WorkGiverDef/BaseWorkGivers.xml
index 4d1aa96d..1266edaf 100644
--- a/DefInjected/WorkGiverDef/BaseWorkGivers.xml
+++ b/DefInjected/WorkGiverDef/BaseWorkGivers.xml
@@ -63,10 +63,14 @@
 		<!-- ============= Crafting ============= -->
 		<DoBillsCremate.verb>火化</DoBillsCremate.verb>
         <DoBillsCremate.gerund>火化</DoBillsCremate.gerund>
+		
+		<!--
 		<DoBillsMakeWoodPlanks_Electric.verb>切割木材</DoBillsMakeWoodPlanks_Electric.verb>
         <DoBillsMakeWoodPlanks_Electric.gerund>切割木材</DoBillsMakeWoodPlanks_Electric.gerund>
 		<DoBillsMakeWoodPlanks_Hand.verb>切割木材</DoBillsMakeWoodPlanks_Hand.verb>
         <DoBillsMakeWoodPlanks_Hand.gerund>切割木材</DoBillsMakeWoodPlanks_Hand.gerund>
+		-->
+		
 		<DoBillsStonecut.verb>切石</DoBillsStonecut.verb>
         <DoBillsStonecut.gerund>切石</DoBillsStonecut.gerund>
 		<DoBillsSlagRefining.verb>提炼</DoBillsSlagRefining.verb>
diff --git a/Keyed/FloatMenu.xml b/Keyed/FloatMenu.xml
index 720e1851..7fdf7519 100644
--- a/Keyed/FloatMenu.xml
+++ b/Keyed/FloatMenu.xml
@@ -45,8 +45,8 @@
   <Equip>装备{0}</Equip>
   <CannotEquip>无法装备{0}</CannotEquip>
 
-  <Deposit>将{0}放置到{1}</Deposit>
-  <CannotDeposit>无法将{0}放置到{1}</CannotDeposit>
+  <Deposit>将{1}放置到{0}</Deposit>
+  <CannotDeposit>无法将{1}放置到{0}</CannotDeposit>
 
   <Drop>丢下{0}</Drop>
 
diff --git a/Keyed/Gameplay.xml b/Keyed/Gameplay.xml
index 330460b0..a0550682 100644
--- a/Keyed/Gameplay.xml
+++ b/Keyed/Gameplay.xml
@@ -121,7 +121,7 @@
   <PowerNotConnected>未连接电网。</PowerNotConnected>
   <PowerConnectedRate>电网功率: {0}W</PowerConnectedRate>
   <PowerConnectedStored>电网蓄电: {0}Wd</PowerConnectedStored>
-  <PowerNeeded>需要电力</PowerNeeded>
+  <PowerNeeded>电力消耗</PowerNeeded>
   <PowerOutput>电力输出</PowerOutput>
   <PowerBatteryStored>蓄电</PowerBatteryStored>
   <PowerBatteryEfficiency>效率</PowerBatteryEfficiency>
diff --git a/Keyed/Menus_Main.xml b/Keyed/Menus_Main.xml
index ae87c7a6..46be82ad 100644
--- a/Keyed/Menus_Main.xml
+++ b/Keyed/Menus_Main.xml
@@ -19,7 +19,7 @@
   <TynansDesignBook>Tynan的设计指南书</TynansDesignBook>
 
   <!--=========== Version info ==========-->
-  <BuildNowAvailable>版本{0}已经发布。建议下载最新版本。</BuildNowAvailable>
+  <BuildNowAvailable>版本{0}已经发布。检查Ludeon.com来获取更多信息。</BuildNowAvailable>
   <BuildUpToDate>版本已是最新。</BuildUpToDate>
   <ErrorGettingVersionInfo>获取版本信息错误: {0}</ErrorGettingVersionInfo>
   <LoadingVersionInfo>正在加载版本信息...</LoadingVersionInfo>
diff --git a/README.txt b/README.txt
index 85009306..71b2f79c 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 RimWorld-cn
 Chinese localization for Rimworld
-Built For Rimworld 0.4.462 (Alpha 4e)
+Built For Rimworld 0.4.466 (Alpha 4f)
 ======================
 See this page for license info:
 http://ludeon.com/forums/index.php?topic=2933.0