From fa31704217a14d28dec7a5e5bddde8d81360570b Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 14 Feb 2020 13:38:05 +0200
Subject: [PATCH] Resolved #1918 - added missing translations

---
 .../template.properties                       |  6 ++++-
 core/src/com/unciv/models/ruleset/Nation.kt   | 24 +++++++++----------
 .../com/unciv/ui/mapeditor/LoadMapScreen.kt   |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/android/assets/jsons/translationsByLanguage/template.properties b/android/assets/jsons/translationsByLanguage/template.properties
index c846c69f54..90ac1fe73e 100644
--- a/android/assets/jsons/translationsByLanguage/template.properties
+++ b/android/assets/jsons/translationsByLanguage/template.properties
@@ -442,10 +442,13 @@ Introduction to [nation] =
 Declare war on [nation] = 
 Luxury resources = 
 Strategic resources = 
-replaces = 
+
+# Nation picker 
+
 [resourceName] not required = 
 Lost ability = 
 National ability = 
+[firstValue] vs [secondValue] = 
 
 # Nations
 
@@ -652,6 +655,7 @@ Load [saveFileName] =
 Delete save = 
 Saved at = 
 Load map = 
+Delete map = 
 Are you sure you want to delete this map? = 
 Upload map = 
 Could not upload map! = 
diff --git a/core/src/com/unciv/models/ruleset/Nation.kt b/core/src/com/unciv/models/ruleset/Nation.kt
index 14f5ebac2e..8b98f63f0e 100644
--- a/core/src/com/unciv/models/ruleset/Nation.kt
+++ b/core/src/com/unciv/models/ruleset/Nation.kt
@@ -101,22 +101,22 @@ class Nation : INamed {
                 .filter { it.uniqueTo == name }) {
             val originalBuilding = ruleset.buildings[building.replaces!!]!!
 
-            textList += building.name.tr() + " - {replaces} " + originalBuilding.name.tr()
+            textList += building.name.tr() + " - "+"Replaces [${originalBuilding.name}]".tr()
             val originalBuildingStatMap = originalBuilding.toHashMap()
             for (stat in building.toHashMap())
                 if (stat.value != originalBuildingStatMap[stat.key])
-                    textList += "  " + stat.key.toString().tr() + " " + stat.value.toInt() + " vs " + originalBuildingStatMap[stat.key]!!.toInt()
+                    textList += "  " + stat.key.toString().tr() + " " + "[${stat.value.toInt()}] vs [${originalBuildingStatMap[stat.key]!!.toInt()}]".tr()
 
             for (unique in building.uniques.filter { it !in originalBuilding.uniques })
                 textList += "  " + unique.tr()
             if (building.maintenance != originalBuilding.maintenance)
-                textList += "  {Maintenance} " + building.maintenance + " vs " + originalBuilding.maintenance
+                textList += "  {Maintenance} " + "[${building.maintenance}] vs [${originalBuilding.maintenance}]".tr()
             if (building.cost != originalBuilding.cost)
-                textList += "  {Cost} " + building.cost + " vs " + originalBuilding.cost
+                textList += "  {Cost} " + "[${building.cost}] vs [${originalBuilding.cost}]".tr()
             if (building.cityStrength != originalBuilding.cityStrength)
-                textList += "  {City strength} " + building.cityStrength + " vs " + originalBuilding.cityStrength
+                textList += "  {City strength} " + "[${building.cityStrength}] vs [${originalBuilding.cityStrength}]".tr()
             if (building.cityHealth != originalBuilding.cityHealth)
-                textList += "  {City health} " + building.cityHealth + " vs " + originalBuilding.cityHealth
+                textList += "  {City health} " + "[${building.cityHealth}] vs [${originalBuilding.cityHealth}]".tr()
             textList += ""
         }
     }
@@ -126,17 +126,17 @@ class Nation : INamed {
                 .filter { it.uniqueTo == name }) {
             val originalUnit = ruleset.units[unit.replaces!!]!!
 
-            textList += unit.name.tr() + " - {replaces} " + originalUnit.name.tr()
+            textList += unit.name.tr() + " - "+"Replaces [${originalUnit.name}]".tr()
             if (unit.cost != originalUnit.cost)
-                textList += "  {Cost} " + unit.cost + " vs " + originalUnit.cost
+                textList += "  {Cost} " + "[${unit.cost}] vs [${originalUnit.cost}]".tr()
             if (unit.strength != originalUnit.strength)
-                textList += "  {Strength} " + unit.strength + " vs " + originalUnit.strength
+                textList += "  {Strength} " + "[${unit.strength}] vs [${originalUnit.strength}]".tr()
             if (unit.rangedStrength != originalUnit.rangedStrength)
-                textList += "  {Ranged strength} " + unit.rangedStrength + " vs " + originalUnit.rangedStrength
+                textList += "  {Ranged strength} " + "[${unit.rangedStrength}] vs [${originalUnit.rangedStrength}]".tr()
             if (unit.range != originalUnit.range)
-                textList += "  {Range} " + unit.range + " vs " + originalUnit.range
+                textList += "  {Range} " + unit.range + "[${unit.range}] vs [${originalUnit.range}]".tr()
             if (unit.movement != originalUnit.movement)
-                textList += "  {Movement} " + unit.movement + " vs " + originalUnit.movement
+                textList += "  {Movement} " + "[${unit.movement}] vs [${originalUnit.movement}]".tr()
             if (originalUnit.requiredResource != null && unit.requiredResource == null)
                 textList += "  " + "[${originalUnit.requiredResource}] not required".tr()
             for (unique in unit.uniques.filterNot { it in originalUnit.uniques })
diff --git a/core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt b/core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt
index 6daa7700b5..6caa065624 100644
--- a/core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt
+++ b/core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt
@@ -15,7 +15,7 @@ import com.unciv.ui.utils.*
 
 class LoadMapScreen(previousMap: TileMap?) : PickerScreen(){
     var chosenMap = ""
-    val deleteMapButton = TextButton("Delete map",skin)
+    val deleteMapButton = TextButton("Delete map".tr(),skin)
 
     init {
         rightSideButton.setText("Load map".tr())