diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json index 4a487880ef..67cf726be3 100644 --- a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json +++ b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json @@ -275,15 +275,17 @@ "Remove":{ Italian:"Rimuovi" + Simplified_Chinese:"删除" } "Random":{ Italian:"Casuale" + Simplified_Chinese:"随机" } "Human":{ Italian:"Umano" - Simplified_Chinese:"人类玩家" + Simplified_Chinese:"玩家" Russian:"Человек" } @@ -386,6 +388,10 @@ Simplified_Chinese:"游戏速度" } + "Starting Era":{ + Simplified_Chinese:"开始时代" + } + "Quick":{ Italian:"Rapida" Russian:"Быстрая" @@ -415,15 +421,18 @@ "It looks like we can't make a map with the parameters you requested!":{ Italian:"Sembra che i parametri da te impostati siano eccessivi per questa mappa!" Russian:"Похоже, что мы не можем создать карту с нужными вам параметрами!" + Simplified_Chinese:"无法根据你的设置创建地图！" } "Maybe you put too many players into too small a map?":{ Italian:"Forse hai inserito troppi giocatori o altri parametri?" Russian:"Может, у вас слишком много игроков для такой небольшой карты?" + Simplified_Chinese:"或许你放置了太多玩家在如此小的地图上？" } "No human players selected!":{ Italian:"È necessario almeno un giocatore umano!" + Simplified_Chinese:"未选择玩家！" } diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json index a8592daa55..85a34e2a76 100644 --- a/android/assets/jsons/Translations/Notifications.json +++ b/android/assets/jsons/Translations/Notifications.json @@ -103,7 +103,7 @@ German:"[cityName] wurde gegründet!" Dutch:"[cityName] is gesticht!" Spanish:"¡[cityName] ha sido fundada!" - Simplified_Chinese:"已经建立了城市--[cityName]!" + Simplified_Chinese:"已经建立了城市：[cityName]!" Portuguese:"[cityName] foi fundada!" Japanese:"[cityName]が設立されました！" } diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index bc8cef16ec..7447dc4ef3 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -1379,6 +1379,7 @@ "Your citizens have been happy with your rule for so long that the empire enters a Golden Age!":{ Italian:"I tuoi cittadini sono da tempo contenti del tuo governo! Il tuo impero è entrato in un'Età dell'Oro!" + Simplified_Chinese:"人民为您英明领导下取得的丰功伟绩欢欣鼓舞，您的帝国进入了黄金时代！" } ////// Policy picker screen diff --git a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt b/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt index 9010142cc4..3caaaf0a7e 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt @@ -49,7 +49,7 @@ class CityScreenCityPickerTable(val cityScreen: CityScreen) : Table(){ cityNameTable.add(resistanceImage).size(20f).padRight(5f) } - val currentCityLabel = Label(city.name + " (" + city.population.population + ")", CameraStageBaseScreen.skin) + val currentCityLabel = Label(city.name, CameraStageBaseScreen.skin) currentCityLabel.setFontSize(30) currentCityLabel.onClick { val editCityNamePopup = PopupTable(cityScreen) diff --git a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt index 27124045f8..7351706945 100644 --- a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt +++ b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt @@ -88,7 +88,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera clearSelection() selectedImprovement=TileImprovement().apply { name="StartingLocation "+nation.name } val nationIcon = getHex(Color.WHITE,ImageGetter.getNationIndicator(nation,40f)) - setCurrentHex(nationIcon, nation.name+" starting location") + setCurrentHex(nationIcon, "[${nation.name}] starting location") } nationsTable.add(nationImage).row() } diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameScreenOptionsTable.kt b/core/src/com/unciv/ui/newgamescreen/NewGameScreenOptionsTable.kt index 110d3c3ecc..4790f19f99 100644 --- a/core/src/com/unciv/ui/newgamescreen/NewGameScreenOptionsTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/NewGameScreenOptionsTable.kt @@ -143,10 +143,10 @@ class NewGameScreenOptionsTable(val newGameParameters: GameParameters, val onMul private fun addEraSelectBox() { add("{Starting Era}:".tr()) - val eraSelectBox = TranslatedSelectBox(TechEra.values().map { it.name }, newGameParameters.startingEra.name, CameraStageBaseScreen.skin) + val eraSelectBox = TranslatedSelectBox(TechEra.values().map { it.name+" era" }, newGameParameters.startingEra.name, CameraStageBaseScreen.skin) eraSelectBox.addListener(object : ChangeListener() { override fun changed(event: ChangeEvent?, actor: Actor?) { - newGameParameters.startingEra = TechEra.valueOf(eraSelectBox.selected.value) + newGameParameters.startingEra = TechEra.valueOf(eraSelectBox.selected.value.replace(" era","")) } }) add(eraSelectBox).pad(10f).row() diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt index 9b6ad8d6a5..d7a7d709fd 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt @@ -44,7 +44,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){ deselectUnitButton.add(Label("X",CameraStageBaseScreen.skin).setFontColor(Color.WHITE)).pad(10f) deselectUnitButton.pack() deselectUnitButton.touchable = Touchable.enabled - deselectUnitButton.onClick { selectedUnit=null; selectedCity=null; worldScreen.shouldUpdate=true } + deselectUnitButton.onClick { selectedUnit=null; selectedCity=null; worldScreen.shouldUpdate=true;this@UnitTable.isVisible=false } addActor(deselectUnitButton) helpUnitButton.add(Label("?",CameraStageBaseScreen.skin).setFontColor(Color.WHITE)).pad(10f) @@ -86,6 +86,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){ fun update() { if(selectedUnit!=null) { + isVisible=true if (selectedUnit!!.civInfo != worldScreen.viewingCiv) { // The unit that was selected, was captured. It exists but is no longer ours. selectedUnit = null selectedCity = null @@ -221,6 +222,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){ // tapping the same tile again will deselect a unit. // important for single-tap-move to abort moving easily selectedUnit = null + isVisible=false } if(selectedUnit != previouslySelectedUnit)