Resolved untranslated texts as per #6131

- Requires more population
- Religious
- "Requires" in Policy civilopedia text
- "for" in improvement civilopedia text
- Untranslated conditionals in battle table (listed as "when fighting in [tileFilter] tiles")

android/assets/jsons/translations/template.properties

@@ -229,6 +229,7 @@ Cultured =
 Maritime = 
 Mercantile = 
 Militaristic = 
+Religious =
 Type = 
 Friendly = 
 Neutral = 

core/src/com/unciv/logic/battle/BattleDamage.kt

@@ -7,6 +7,7 @@ import com.unciv.models.ruleset.unique.StateForConditionals
 import com.unciv.models.ruleset.unique.Unique
 import com.unciv.models.ruleset.unique.UniqueTarget
 import com.unciv.models.ruleset.unique.UniqueType
+import com.unciv.models.translations.tr
 import com.unciv.ui.utils.toPercent
 import java.util.*
 import kotlin.collections.set
@@ -26,7 +27,7 @@ object BattleDamage {
         }
         if (unique.conditionals.isEmpty()) return source
 
-        val conditionalsText = unique.conditionals.joinToString { it.text }
+        val conditionalsText = unique.conditionals.joinToString { it.text.tr() }
         return "$source - $conditionalsText"
     }
 

core/src/com/unciv/models/ruleset/Policy.kt

@@ -63,7 +63,7 @@ open class Policy : RulesetObject() {
         if (policyBranchType != PolicyBranchType.BranchComplete && requires != null && requires!!.isNotEmpty()) {
             lineList += FormattedLine()
             if (requires!!.size == 1)
-                requires!!.first().let { lineList += FormattedLine("Requires: [$it]", link = "Policy/$it") }
+                requires!!.first().let { lineList += FormattedLine("Requires [$it]", link = "Policy/$it") }
             else {
                 lineList += FormattedLine("Requires all of the following:")
                 requires!!.forEach {

core/src/com/unciv/models/ruleset/tile/TileImprovement.kt

@@ -118,27 +118,15 @@ class TileImprovement : RulesetStatsObject() {
             }
         }
 
-        val statsToResourceNames = HashMap<String, ArrayList<String>>()
+        var addedLineBeforeResourceBonus = false
         for (resource in ruleset.tileResources.values.filter { it.improvement == name }) {
-            val statsString = resource.improvementStats.toString()
-            if (statsString !in statsToResourceNames)
-                statsToResourceNames[statsString] = ArrayList()
-            statsToResourceNames[statsString]!!.add(resource.name)
-        }
-        if (statsToResourceNames.isNotEmpty()) {
-            statsToResourceNames.forEach {
+            if (!addedLineBeforeResourceBonus) {
+                addedLineBeforeResourceBonus = true
                 textList += FormattedLine()
-                if (it.value.size == 1) {
-                    with(it.value[0]) {
-                        textList += FormattedLine("${it.key}{ for }{$this}", link="Resource/$this")
-                    }
-                } else {
-                    textList += FormattedLine("${it.key}{ for }:")
-                    it.value.forEach { resource ->
-                        textList += FormattedLine(resource, link="Resource/$resource", indent=1)
-                    }
-                }
             }
+            val statsString = resource.improvementStats.toString()
+
+            textList += FormattedLine("${statsString}{ for }{$name}", link = "Resource/$name")
         }
 
         if (techRequired != null) {

core/src/com/unciv/models/ruleset/unit/BaseUnit.kt

@@ -369,7 +369,7 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
         }
         for (unique in getMatchingUniques(UniqueType.RequiresPopulation))
             if (unique.params[0].toInt() > cityConstructions.cityInfo.population.population)
-                rejectionReasons.add(RejectionReason.PopulationRequirement)
+                rejectionReasons.add(RejectionReason.PopulationRequirement.apply { errorMessage = unique.text })
         return rejectionReasons
     }