diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index ad14c1a9f1..23a54e396a 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -458,6 +458,8 @@ Czech:"Národní Akademie" } "Manhattan Project":{ + Simplified_Chinese:"曼哈顿计划" + Traditional_Chinese:"曼哈頓計畫" } "Chichen Itza":{ @@ -499,6 +501,8 @@ } "Enables nuclear weapon":{ + Simplified_Chinese:"允许建造核武器" + Traditional_Chinese:"允許建造核武器" } "Lighthouse":{ diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index ac33bda04b..16557353ed 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -1684,13 +1684,15 @@ "Bombard":{ Italian:"Bombarda" Simplified_Chinese:"轰击" - Traditional_Chinese:"轟炸" + Traditional_Chinese:"轟擊" Czech:"Bombardovat" Russian:"Бомбардировать" Ukrainian:"Обстрілювати" } "NUKE":{ + Simplified_Chinese:"核武器攻击" + Traditional_Chinese:"核武器攻擊" } "Captured!":{// Shown in the battle table when attacking a civilian unit diff --git a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json index 2052aa5c8c..cd946c4493 100644 --- a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json +++ b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json @@ -161,6 +161,8 @@ } "Fallout":{ + Simplified_Chinese:"核辐射" + Traditional_Chinese:"核輻射" } "Oasis":{ @@ -1044,7 +1046,9 @@ } "Remove Fallout":{ -}, + Simplified_Chinese:"消除核辐射" + Traditional_Chinese:"消除核輻射" +} "Ancient ruins":{ Italian:"Antiche rovine" diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index de99320a62..035f49bb7f 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -1292,7 +1292,9 @@ } "Requires Manhattan Project":{ -}, + Simplified_Chinese:"需要完成曼哈顿计划" + Traditional_Chinese:"需要完成曼哈頓計畫" +} "6 tiles in every direction always visible":{ Italian:"6 caselle in ogni direzione sempre visibili" @@ -1509,6 +1511,8 @@ "Nuclear Missile":{ Italian:"Missile nucleare" Czech:"Jaderná raketa" + Simplified_Chinese:"核导弹" + Traditional_Chinese:"核導彈" } ////// Great units diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt index ad08d6c7ba..56cab31442 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt @@ -44,7 +44,6 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc init { setDefaultCloseAction() onBackButtonClicked { UnCivGame.Current.setWorldScreen() } - scrollPane.style = skin.get(ScrollPane.ScrollPaneStyle::class.java) // So we can see scrollbars scrollPane.setOverscroll(false,false) tempTechsToResearch = ArrayList(civTech.techsToResearch)