Version rollout (#8338)

* Bump version and create initial changelog entry

* fix SimplifiedChinese translation (#8331)

Co-authored-by: chr56 <_>

* Fixed 'ConditionalsPlacement' with 'after' (#8319)

* Update Simplified_Chinese.properties (#8318)

* Update Simplified_Chinese.properties

* A little modification

* Update Korean.properties (#8317)

* Update Italian.properties (#8316)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>

android/assets/jsons/translations/Brazilian_Portuguese.properties

@@ -1645,7 +1645,7 @@ Unit [unitName] doesn't seem to exist! = A unidade [unitName] parece não existi
 # Example: In the unique "+20% Strength <for [unitFilter] units>", should the <for [unitFilter] units>
 # be translated before or after the "+20% Strength"?
 
-ConditionalsPlacement = Colocação Condicional
+ConditionalsPlacement = after
 
 # The second determines the exact ordering of all conditionals that are to be translated.
 # ALL conditionals that exist will be part of this line, and they may be moved around and rearranged as you please.

android/assets/jsons/translations/Italian.properties

@@ -348,15 +348,12 @@ Map file = File mappa
 Max Turns = Limite turni
 Could not load map! = Mappa non trovata!
 Generated = Generato
- # Requires translation!
-Random Generated = 
- # Requires translation!
-Which options should be available to the random selection? = 
+Random Generated = Generazione casuale
+Which options should be available to the random selection? = Quali opzioni vuoi rendere disponibili per la selezione casuale?
 Existing = Esistente
 Custom = Personalizzata
 Map Generation Type = Tipo generazione mappa
- # Requires translation!
-Enabled Map Generation Types = 
+Enabled Map Generation Types = Tipi generazione mappa abilitati
 Default = Default
 Pangaea = Pangea
 Smoothed Random = Casuale piatta
@@ -387,8 +384,7 @@ Time = A tempo
 ? = ?
 
 Map Shape = Forma della mappa
- # Requires translation!
-Enabled Map Shapes = 
+Enabled Map Shapes = Abilita forme mappa
 Hexagonal = Esagonale
 Flat Earth Hexagonal = Terra piatta esagonale
 Rectangular = Rettangolare
@@ -398,10 +394,8 @@ Radius = Raggio
 Enable Espionage = Abilita Spionaggio
 
 Resource Setting = Impostazioni risorse
- # Requires translation!
-Enabled Resource Settings = 
- # Requires translation!
-Other Settings = 
+Enabled Resource Settings = Abilita impostazioni risorse
+Other Settings = Altre impostazioni
 Sparse = Sparse
 Abundant = Abbondanti
 Strategic Balance = Equilibrio strategico
@@ -425,8 +419,7 @@ Open Documentation = Apri documento
 Don't show again = Non mostrare di nuovo
 
 World Size = Dimensioni della mappa
- # Requires translation!
-Enabled World Sizes = 
+Enabled World Sizes = Abilita dimensioni mappa
 Tiny = Minuscola
 Small = Piccola
 Medium = Media
@@ -1079,8 +1072,7 @@ In resistance for another [numberOfTurns] turns = Resistenza! ([numberOfTurns] t
 We Love The King Day for another [numberOfTurns] turns = Viva il Re! (altri [numberOfTurns] turni)
 Demanding [resource] = Esige [resource]
 Sell for [sellAmount] gold = Vendi ([sellAmount] Oro)
- # Requires translation!
-Sell = 
+Sell = Vendi
 Are you sure you want to sell this [building]? = Vuoi davvero vendere [building]?
 Free = Gratuito
 [greatPerson] points = Punti [greatPerson]
@@ -1455,8 +1447,7 @@ Completed = Completa
 On adoption = All'adozione
 On completion = Al completamento
 Cannot be adopted together with = Non adottabile insieme a
- # Requires translation!
-Cannot be adopted before = 
+Cannot be adopted before = Non adottabile prima di
 Adopt policy = Adotta politica
 Adopt free policy = Adotta politica
 Unlocked at = Richiede

android/assets/jsons/translations/Korean.properties

@@ -445,10 +445,10 @@ Epic = 서사시
 Marathon = 마라톤
 
 Starting Era = 시작 시대
-It looks like we can't make a map with the parameters you requested! = 설정된 변수로 지도를 만들 수 없습니다
-Maybe you put too many players into too small a map? = 지도 크기에 비해 플레이어가 너무 많습니다
-No human players selected! = 인간 플레이어가 선택되지 않았습니다
-Invalid Player ID! = 잘못된 플레이어 ID입니다!
+It looks like we can't make a map with the parameters you requested! = 설정된 변수로 지도를 만들 수 없습니다!
+Maybe you put too many players into too small a map? = 지도 크기에 비해 플레이어가 너무 많습니다.
+No human players selected! = 인간 플레이어가 선택되지 않았습니다!
+Invalid Player ID! = 플레이어 ID가 잘못되었습니다!
 No victory conditions were selected! = 승리 조건이 선택되지 않았습니다!
 Mods: = 모드:
 Extension mods: = 확장 모드:
@@ -1538,7 +1538,7 @@ Update status of currently played game every: = 플레이 중인 게임 새로
 In-game, update status of all games every: = 앱 실행 중 새로고침 간격
 Server address = 서버 주소
 Reset to Dropbox = Dropbox로 초기화
-Check connection to server = 서버와의 연결 확인중
+Check connection to server = 서버와의 연결 확인
 Awaiting response... = 응답 대기중...
 Success! = 성공!
 Failed! = 실패!

android/assets/jsons/translations/Simplified_Chinese.properties

@@ -345,15 +345,12 @@ Map file = 地图文件
 Max Turns = 最大回合
 Could not load map! = 无法加载地图！
 Generated = 根据设置生成
- # Requires translation!
-Random Generated = 
- # Requires translation!
-Which options should be available to the random selection? = 
+Random Generated = 随机生成
+Which options should be available to the random selection? = 从哪些选项中随机选择？
 Existing = 从文件载入
 Custom = 自定义
 Map Generation Type = 生成地图类型
- # Requires translation!
-Enabled Map Generation Types = 
+Enabled Map Generation Types = 可用的生成地图类型
 Default = 预设
 Pangaea = 盘古大陆
 Smoothed Random = 平滑随机
@@ -384,8 +381,7 @@ Time = 时间
 ? = ?
 
 Map Shape = 地图形状
- # Requires translation!
-Enabled Map Shapes = 
+Enabled Map Shapes = 可用的地图形状
 Hexagonal = 六边形
 Flat Earth Hexagonal = 扁平地球六边形
 Rectangular = 四边形
@@ -395,10 +391,8 @@ Radius = 半径
 Enable Espionage = 启用间谍
 
 Resource Setting = 资源设置
- # Requires translation!
-Enabled Resource Settings = 
- # Requires translation!
-Other Settings = 
+Enabled Resource Settings = 可用的资源设置
+Other Settings = 其它设置
 Sparse = 稀疏的
 Abundant = 大量的
 Strategic Balance = 战略平衡
@@ -422,8 +416,7 @@ Open Documentation = 打开帮助文件（全英语警告）
 Don't show again = 不再显示
 
 World Size = 世界大小
- # Requires translation!
-Enabled World Sizes = 
+Enabled World Sizes = 可用的世界大小
 Tiny = 极小
 Small = 小
 Medium = 中
@@ -723,7 +716,7 @@ off = 关闭
 Show pixel units = 显示像素单位
 Show pixel improvements = 显示像素设施
 Enable Nuclear Weapons = 启用核武器
-Experimental Demographics scoreboard = 新的人口计数器（实验性）
+Experimental Demographics scoreboard = 启用实验性统计记分板
 Unit icon opacity = 单位图标不透明度
 Show zoom buttons in world screen = 在游戏界面显示缩放按钮
 Enable display cutout (requires restart) = 启用切边显示（需要重启）
@@ -1007,7 +1000,7 @@ Start new game = 开始新游戏
 Save game = 保存游戏
 Load game = 读取游戏
 Main menu = 主菜单
-Resume = 继续游戏
+Resume = 继续
 Cannot resume game! = 无法继续游戏！
 Not enough memory on phone to load game! = 没有足够的内存载入游戏！
 Quickstart = 快速开始
@@ -1066,16 +1059,15 @@ Food eaten = 人口消耗
 Unassigned population = 闲置人口
 [turnsToExpansion] turns to expansion = 此城市将在 [turnsToExpansion] 回合后扩张
 Stopped expansion = 扩张已停止
-[turnsToPopulation] turns to new population = 此城市将在 [turnsToPopulation] 轮后新增 1 个新市民
+[turnsToPopulation] turns to new population = 此城市将在 [turnsToPopulation] 回合后新增 1 个新市民
 Food converts to production = 食物转化为产能
-[turnsToStarvation] turns to lose population = 此城市将在[turnsToStarvation]轮后失去 1 个市民
+[turnsToStarvation] turns to lose population = 此城市将在[turnsToStarvation]回合后失去 1 个市民
 Stopped population growth = 人口增长已停止
 In resistance for another [numberOfTurns] turns = 抵抗将持续额外的 [numberOfTurns] 回合
 We Love The King Day for another [numberOfTurns] turns = “我们爱戴领袖日”将持续额外的 [numberOfTurns] 回合
 Demanding [resource] = 要求得到[resource]资源
 Sell for [sellAmount] gold = 卖掉将获得 [sellAmount] 金钱
- # Requires translation!
-Sell = 
+Sell = 卖掉
 Are you sure you want to sell this [building]? = 您真的想卖掉[building]吗？
 Free = 免费
 [greatPerson] points = [greatPerson]点数
@@ -1277,8 +1269,8 @@ Capture [cityName] = 占领[cityName]
 Our status = 我们的进度
 Global status = 全球进度
 Rankings = 排名
-Demographics = 人口统计
-Demographic = 人口
+Demographics = 统计数据
+Demographic = 统计数据
 Rank = 排名
 Value = 数值
 Best = 全球领先
@@ -1450,8 +1442,7 @@ Completed = 完成
 On adoption = 推行后
 On completion = 完成后
 Cannot be adopted together with = 不能与下列政策同时推行：
- # Requires translation!
-Cannot be adopted before = 
+Cannot be adopted before = 不能在下列政策之前推行
 Adopt policy = 推行政策
 Adopt free policy = 推行免费的政策
 Unlocked at = 解锁时代：
@@ -1509,7 +1500,7 @@ Enhanced religion = 强化宗教
 # feel free to not translate these strings for now
 
 Spy = 间谍
-Spy Hideout = 间谍正藏身于
+Spy Hideout = 藏身处
 Spy present = 间谍正在
 Move = 移动
 
@@ -6127,7 +6118,7 @@ before founding a Pantheon = 在建立万神殿之后
 after founding a Pantheon = 在建立万神殿之前
 with [resource] = 拥有[resource]的
 without [resource] = 未拥有[resource]的
-in cities with a [buildingFilter] = 在正在建造[buildingFilter]的城市中
+in cities with a [buildingFilter] = 在建有[buildingFilter]的城市中
 for units with [promotion] = 对于拥有[promotion]的单位
 for units without [promotion] = 对于没有[promotion]的单位
 when above [amount] HP = 当超过[amount]生命值时

buildSrc/src/main/kotlin/BuildConfig.kt

@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.7.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 791
-    const val appVersion = "4.3.17"
+    const val appCodeNumber = 792
+    const val appVersion = "4.3.18"
 
     const val gdxVersion = "1.11.0"
     const val roboVMVersion = "2.3.1"

changelog.md

@@ -1,3 +1,21 @@
+## 4.3.18
+
+Units are not displaced to enemy land when kicked out of borders
+
+UI: Better unit table
+
+Resolve  - fix Faith tutorial text
+
+By vegeta1k95:
+- Fix City plates aircraft table shape 
+- Rework of PromotionPicker UI 
+- Refactored and commented GameInfo.nextTurn() 
+- Better visibility for city status icons 
+
+By nacro711072:
+- Refactor maptype & resolve map setting issue 
+- update screen after disband unit. 
+
 ## 4.3.17
 
 Fixed Air Sweep mechanic

core/src/com/unciv/UncivGame.kt

@@ -470,7 +470,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
 
     companion object {
         //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
-        val VERSION = Version("4.3.17", 791)
+        val VERSION = Version("4.3.18", 792)
         //endregion
 
         lateinit var Current: UncivGame

fastlane/metadata/android/en-US/changelogs/792.txt

@@ -0,0 +1,17 @@
+
+
+Units are not displaced to enemy land when kicked out of borders
+
+UI: Better unit table
+
+Resolve  - fix Faith tutorial text
+
+By vegeta1k95:
+- Fix City plates aircraft table shape 
+- Rework of PromotionPicker UI 
+- Refactored and commented GameInfo.nextTurn() 
+- Better visibility for city status icons 
+
+By nacro711072:
+- Refactor maptype & resolve map setting issue 
+- update screen after disband unit.