diff --git a/android/assets/game.png b/android/assets/game.png index 9d80daeb6a..9a0b22473e 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 65d4a7bb1b..a5fc61cc1c 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -950,7 +950,7 @@ } "Pick now!": { - Italian: "Scegli ora!" //You didn't translate this in Italian, said Smashfanful + Italian: "Scegli ora!" German: "Jetzt wählen!" } @@ -1079,7 +1079,7 @@ } "Stopped expansion":{ // if culture is 0 - Italian:"Espansione arrestata" //You didn't translate this in Italian, said Smashfanful + Italian:"Espansione arrestata" Russian:"Расширение остановлено" French:"Expansion arrêtée" Romanian:"Expansiunea sa oprit" @@ -2474,7 +2474,7 @@ } "[tradeOffer] from [otherCivName] has ended":{ - Italian:"Accordo di [tradeOffer] da [otherCivName] terminato" //You didn't translate this in Italian, said Smashfanful + Italian:"Accordo di [tradeOffer] da [otherCivName] terminato" Simplified_Chinese:"与[civName]的[tradeOffer]协议已经结束" French:"[tradeOffer] de [otherCivName] a pris fin" Portuguese:"[tradeOffer] de [otherCivName] terminou" @@ -3212,6 +3212,7 @@ "Occurs on [listOfTerrains]":{ //For civilopedia again Italian:"Può avvenire/avviene su [listOfTerrains]" + } "Requires worked [resource] near city":{ diff --git a/android/build.gradle b/android/build.gradle index 7e064043ae..308e5cfbe2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,7 +21,7 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 249 + versionCode 250 versionName "2.17.0" } diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index 13cba2884a..8c640a62f9 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -120,7 +120,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { / city.cityStats.currentCityStats.culture).toInt() turnsToExpansionString = "[$turnsToExpansion] turns to expansion".tr() } else { - turnsToExpansionString = "Stopped expansion" + turnsToExpansionString = "Stopped expansion".tr() } table.add(Label(turnsToExpansionString + " (" + city.expansion.cultureStored + "/" + city.expansion.getCultureToNextTile() + ")", skin)).colspan(columns).row() diff --git a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt index c5edecfb88..b1bca7175c 100644 --- a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt @@ -2,8 +2,10 @@ package com.unciv.ui.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable -import com.badlogic.gdx.scenes.scene2d.ui.* -import com.badlogic.gdx.utils.Align +import com.badlogic.gdx.scenes.scene2d.ui.Button +import com.badlogic.gdx.scenes.scene2d.ui.Label +import com.badlogic.gdx.scenes.scene2d.ui.Table +import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup import com.unciv.logic.map.TileInfo import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.tile.TileImprovement @@ -59,8 +61,7 @@ class ImprovementPickerScreen(tileInfo: TileInfo, onAccept: ()->Unit) : PickerSc descriptionLabel.setText(improvement.description) } - val pickNow = Label("Pick now!", skin) - pickNow.touchable = Touchable.enabled + val pickNow = "Pick now!".toLabel() pickNow.onClick { accept(improvement) } diff --git a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt index 462cff7c0f..f74a336686 100644 --- a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt @@ -3,7 +3,6 @@ package com.unciv.ui.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.ui.Button -import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup import com.badlogic.gdx.utils.Align @@ -74,8 +73,7 @@ class PromotionPickerScreen(mapUnit: MapUnit) : PickerScreen() { descriptionLabel.setText(descriptionText) } - val pickNow = Label("Pick now!", skin) - pickNow.touchable = Touchable.enabled + val pickNow = "Pick now!".toLabel() pickNow.setAlignment(Align.center) pickNow.onClick { accept(promotion)