From 837195293cbb79b22773a4dc10fa753ddf8fef1c Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 1 Jul 2018 16:59:41 +0300
Subject: [PATCH] Fixed minor merge conflict between dutch and other languages

---
 android/assets/jsons/Techs.json               |  4 +-
 android/assets/jsons/Translations.json        | 14 +++++--
 .../logic/civilization/CivilizationInfo.kt    | 38 +++++++++----------
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json
index f5f6f62554..74abdba3fc 100644
--- a/android/assets/jsons/Techs.json
+++ b/android/assets/jsons/Techs.json
@@ -190,7 +190,7 @@
 				name:"Education",
 				row:3,
 				prerequisites:["Theology","Civil Service"],
-				baseDescription:"Allows cities to convert production to science,"
+				baseDescription:"Enables conversion of city production to science"
 			},
 			{
 				name:"Chivalry",
@@ -201,7 +201,7 @@
 				name:"Machinery",
 				row:8,
 				prerequisites:["Guilds","Engineering"],
-				baseDescription:"Speeds movement speed on roads"
+				baseDescription:"Improves movement speed on roads"
 			},
 			{
 				name:"Physics",
diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index 9f673af78c..d07de2174a 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -160,12 +160,13 @@
 		German:"Gesundheit"
 		Dutch:"Gezondheid"
 	}
-	
+
 	"Disband unit":{
 		Italian:"Disbandare"
 		Russian:"Расформировать"
 		French:"Dissoudre unité"
 		Romanian:"Desfaceți unitatea"
+		Dutch:"Eenheid opheffen"
 	}
 	
 	"Do you really want to disband this unit?":{
@@ -173,18 +174,21 @@
 		Russian:"Вы действительно хотите распустить этот блок?"
 		French:"Voulez-vous vraiment dissoudre cette unité?"
 		Romanian:""
+		Dutch:"Wil je echt deze eenheid opheffen"
 	}
 	"Yes":{
 		Italian:"Si"
 		Russian:"Да"
 		French:"Oui"
 		Romanian:"Da"
+		Dutch:"Ja"
 	}
 	"No":{
 		Italian:"No"
 		Russian:"Нет"
 		French:"Non"
 		Romanian:"Nu"
+		Dutch:"Nee"
 	}
 	
 
@@ -461,7 +465,7 @@
 		French:"Choisissez une technologie"
 		Romanian:"Alege o tehnologie"
 		German:"Technologie auswählen"
-		DUtch:"Technologie kiezen"
+		Dutch:"Technologie kiezen"
 	}
 	
 	"Pick a free tech":{
@@ -487,7 +491,7 @@
 		Russian:"Выберите [technology] как бесплатную технику"
 		French:"Choisissez [technology] comme technologie libre"
 		Romanian:"Alegeți [tehnology] ca tehnologie gratuită"
-		DUtch:"[technologie] kiezen als gratis technologie"
+		Dutch:"[technologie] kiezen als gratis technologie"
 	}
 
 	"Units enabled":{
@@ -1899,6 +1903,10 @@
 		Dutch:"Wie weet wat de toekomst inhoud?"
 	}
 	
+	"Improves movement speed on roads":{}
+	"Enables conversion of city production to science":{}
+	"Enables conversion of city production to gold":{}
+	
 	// Tech Eras
 	// In case of foreign languages it becomes gender sensitive words
 	//Also in russian "Medieval Era" becomes "Средневековье" or italian for "Renaissance Era" becomes "Rinascimento". So they got a single world to replace 2 english ones
diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index 0dce22b2a1..1350bd450e 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -33,7 +33,7 @@ class CivilizationInfo {
     var goldenAges = GoldenAgeManager()
     var greatPeople = GreatPersonManager()
     var scienceVictory = ScienceVictoryManager()
-    @Transient var diplomacy = HashMap<String,DiplomacyManager>()
+    //@Transient var diplomacy = HashMap<String,DiplomacyManager>()
 
     var cities = ArrayList<CityInfo>()
     var exploredTiles = HashSet<Vector2>()
@@ -63,8 +63,8 @@ class CivilizationInfo {
             statMap[entry.key]!!.happiness += entry.value
         }
 
-        statMap.put("Transportation upkeep",Stats().apply { gold=- getTransportationUpkeep().toFloat()})
-        statMap.put("Unit upkeep",Stats().apply { gold=- getUnitUpkeep().toFloat()})
+        statMap["Transportation upkeep"] = Stats().apply { gold=- getTransportationUpkeep().toFloat()}
+        statMap["Unit upkeep"] = Stats().apply { gold=- getUnitUpkeep().toFloat()}
 
         if (policies.isAdopted("Mandate Of Heaven")) {
             if (!statMap.containsKey("Policies")) statMap["Policies"] = Stats()
@@ -243,19 +243,19 @@ class CivilizationInfo {
     }
 }
 
-enum class DiplomaticStatus{
-    Peace,
-    War
-}
-
-class DiplomacyManager {
-    @Transient lateinit var civInfo:CivilizationInfo
-    lateinit var otherCivName:String
-    var status:DiplomaticStatus = DiplomaticStatus.Peace
-
-    fun otherCiv() = civInfo.gameInfo.civilizations.first{it.civName==otherCivName}
-    fun declareWar(){
-        status = DiplomaticStatus.War
-        otherCiv().diplomacy[civInfo.civName]!!.status = DiplomaticStatus.War
-    }
-}
\ No newline at end of file
+//enum class DiplomaticStatus{
+//    Peace,
+//    War
+//}
+//
+//class DiplomacyManager {
+//    @Transient lateinit var civInfo:CivilizationInfo
+//    lateinit var otherCivName:String
+//    var status:DiplomaticStatus = DiplomaticStatus.Peace
+//
+//    fun otherCiv() = civInfo.gameInfo.civilizations.first{it.civName==otherCivName}
+//    fun declareWar(){
+//        status = DiplomaticStatus.War
+//        otherCiv().diplomacy[civInfo.civName]!!.status = DiplomaticStatus.War
+//    }
+//}
\ No newline at end of file