From b565489fd5625c1b29628d1ea8282a91b5870d61 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 19 Jul 2019 14:01:16 +0300 Subject: [PATCH] Changed "free population" in cities to "unassigned population" to be less confusing --- android/assets/jsons/Translations/Other.json | 2 +- core/src/com/unciv/ui/cityscreen/CityScreen.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 97acdf07c3..5fd4fe8f58 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -862,7 +862,7 @@ Portuguese:"Bonus de crescimento" } - "Free population":{ // as in "Free population: 2/13 + "Unassigned population":{ // as in "Unassigned population: 2/13 Italian:"Popolazione libera" Russian:"Свободное население" French:"Population libre" diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index 7c0ca756c4..694c5ac867 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -111,7 +111,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { table.defaults().pad(5f) table.background=ImageGetter.getBackground(Color.BLACK.cpy().apply { a=0.8f }) val columns = Stats().toHashMap().size - table.add(Label("{Free population}:".tr() + table.add(Label("{Unassigned population}:".tr() +city.population.getFreePopulation().toString() + "/" + city.population.population,skin)) .colspan(columns).row()