Version rollout (#6820)

* Bump version and create initial changelog entry

* More translations to Brazilian Portuguese (#6814)

* Update Brazilian_Portuguese.properties

* Adding translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Adding more Brazilian Portuguese translations

* Update Simplified_Chinese.properties (#6811)

* Update Simplified_Chinese.properties

Fix 2 errors & fill in the space

* Complete translations for Civilopedia

* Update French.properties (#6794)

* Update Indonesian.properties (#6791)

* Update Italian.properties (#6790)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>

android/assets/jsons/translations/Brazilian_Portuguese.properties

@@ -3,13 +3,13 @@
 # Equivalent of a space in your language
 # If your language doesn't use spaces, just add "" as a translation, otherwise " "
  # Requires translation!
-" " = 
+" " = " "
 
 # If the first word in a sentence starts with a capital in your language, 
 # put the english word 'true' behind the '=', otherwise 'false'.
 # Don't translate these words to your language, only put 'true' or 'false'.
  # Requires translation!
-StartWithCapitalLetter = 
+StartWithCapitalLetter = true
 
 
 # Fastlane
@@ -91,7 +91,7 @@ Cannot be built with [buildingName] = Não pode ser construido tendo [buildingNa
 Consumes 1 [resource] = Consome 1 unid. de [resource]
 Consumes [amount] [resource] = Consome [amount] [resource]
  # Requires translation!
-[amount] available = 
+[amount] available = [amount] disponível
 Required tech: [requiredTech] = Requer tecnologia: [requiredTech]
 Requires [PolicyOrNationalWonder] = Requer [PolicyOrNationalWonder]
 Cannot be purchased = Não pode ser comprado
@@ -120,7 +120,7 @@ Research Agreement = Acordo de Pesquisa
 Declare war = Declarar guerra
 Declare war on [civName]? = Declarar guerra contra [civName]?
  # Requires translation!
-Go to on map = 
+Go to on map = Ir para no mapa
 Let's begin! = Vamos Começar!
 [civName] has declared war on us! = [civName] declarou guerra contra nós!
 [leaderName] of [nation] = [leaderName] de [nation]
@@ -7530,7 +7530,7 @@ Lastly, before founding a religion, new cities you settle will start with 200 pr
 This way, all your cities will starting following your pantheon as long as you haven't founded a religion yet. = 
 
  # Requires translation!
-Inquisitors = 
+Inquisitors = Inquisidores
  # Requires translation!
 Inquisitors are the last religious unit, and their strength is removing other religions. = 
  # Requires translation!
@@ -7545,20 +7545,20 @@ Additionally, when an inquisitor is stationed in or directly next to a city cent
  # Requires translation!
 The Mayan unique ability, 'The Long Count', comes with a side effect: = 
  # Requires translation!
-Once active, the game's year display will use mayan notation. = 
+Once active, the game's year display will use mayan notation. = Quando ativo, a exibição do ano do jogo usará o sistema de numeração maya.
  # Requires translation!
 The Maya measured time in days from what we would call 11th of August, 3114 BCE. A day is called K'in, 20 days are a Winal, 18 Winals are a Tun, 20 Tuns are a K'atun, 20 K'atuns are a B'ak'tun, 20 B'ak'tuns a Piktun, and so on. = 
  # Requires translation!
 Unciv only displays ය B'ak'tuns, ඹ K'atuns and ම Tuns (from left to right) since that is enough to approximate gregorian calendar years. The Maya numerals are pretty obvious to understand. Have fun deciphering them! = 
 
  # Requires translation!
-Your cities will periodically demand different luxury goods to satisfy their desire for new things in life. = 
+Your cities will periodically demand different luxury goods to satisfy their desire for new things in life. = Suas cidades vão periodicamente demandar por diferentes produtos de luxo para satisfazer seu desejo por coisas novas na vida.
  # Requires translation!
 If you manage to acquire the demanded luxury by trade, expansion, or conquest, the city will celebrate We Love The King Day for 20 turns. = 
  # Requires translation!
-During the We Love The King Day, the city will grow 25% faster. = 
+During the We Love The King Day, the city will grow 25% faster. = Durante a celebração do Dia Do Rei, a cidade vai crescer 25% mais rápido.
  # Requires translation!
-This means exploration and trade is important to grow your cities! = 
+This means exploration and trade is important to grow your cities! = Isso significa que exploração e comércio são importantes para o crescimento das suas cidades!
 
 
 #################### Lines from Unique Types #######################
@@ -7568,13 +7568,13 @@ Nullifies [stat] [cityFilter] =
  # Requires translation!
 Nullifies Growth [cityFilter] = 
  # Requires translation!
-Provides [stats] per turn = 
+Provides [stats] per turn = Fornece [stats] por turno
  # Requires translation!
 Provides [stats] [cityFilter] per turn = 
  # Requires translation!
-Provides [amount] Happiness = 
+Provides [amount] Happiness = Fornece [amount] de Felicidade
  # Requires translation!
-Provides military units every ≈[amount] turns = 
+Provides military units every ≈[amount] turns = Fornece unidades militares a cada ≈[amount] turnos
  # Requires translation!
 Provides a unique luxury = 
  # Requires translation!
@@ -7594,23 +7594,23 @@ May buy [buildingFilter] buildings with [stat] for [amount] times their normal P
  # Requires translation!
 [stat] cost of purchasing [buildingFilter] buildings [relativeAmount]% = 
  # Requires translation!
-Production to science conversion in cities increased by 33% = 
+Production to science conversion in cities increased by 33% = Conversão de produção para ciência em cidades aumentado em 33%
  # Requires translation!
-Triggers victory = 
+Triggers victory = Aciona vitória
  # Requires translation!
 Starts with [policy] adopted = 
  # Requires translation!
-[amount] Unit Supply = 
+[amount] Unit Supply = [amount] suprimentos de unidade
  # Requires translation!
 [amount] Unit Supply per [amount2] population [cityFilter] = 
  # Requires translation!
-[amount] Unit Supply per city = 
+[amount] Unit Supply per city = [amount] de suprimentos de unidade por cidade
  # Requires translation!
 Rebel units may spawn = 
  # Requires translation!
 Can be purchased for [amount] [stat] [cityFilter] = 
  # Requires translation!
-Requires a [buildingName] in at least [amount] cities = 
+Requires a [buildingName] in at least [amount] cities = Requer um(a) [buildingName] em pelo menos [amount] cidades
  # Requires translation!
 Must not be next to [terrainFilter] = 
  # Requires translation!
@@ -7618,41 +7618,44 @@ Creates a [improvementName] improvement on a specific tile =
  # Requires translation!
 No defensive terrain penalty = 
  # Requires translation!
-May attack when embarked = 
+May attack when embarked = Pode atacar quando embarcado
  # Requires translation!
 No Sight =
  # Requires translation!
-[amount] XP gained from combat = 
+[amount] XP gained from combat = [amount] XP recebido do combate
  # Requires translation!
-[amount] Movement point cost to embark = 
+[amount] Movement point cost to embark = Custa [amount] pontos de movimento para embarcar
+ # Requires translation!
+
+Irremovable = Irremovível
  # Requires translation!
 by consuming this unit = 
  # Requires translation!
-when at war = 
+when at war = quando em guerra
  # Requires translation!
-with [resource] = 
+with [resource] = com [resource]
  # Requires translation!
-when between [amount] and [amount2] Happiness = 
+when between [amount] and [amount2] Happiness = quando entre [amount] e [amount2] de Felicidade
  # Requires translation!
-when below [amount] Happiness = 
+when below [amount] Happiness = quando abaixo de [amount] de Felicidade
  # Requires translation!
-during the [era] = 
+during the [era] = Durante a [era]
  # Requires translation!
 if no other Civilization has researched this = 
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy] = depois de adotar [policy]
  # Requires translation!
-in cities with a [buildingFilter] = 
+in cities with a [buildingFilter] = em cidades com um [buildingFilter]
  # Requires translation!
-for units with [promotion] = 
+for units with [promotion] = para unidades com [promotion]
  # Requires translation!
-for units without [promotion] = 
+for units without [promotion] = para unidades sem [promotion]
  # Requires translation!
-when above [amount] HP = 
+when above [amount] HP = quando acima de [amount] HP
  # Requires translation!
-when below [amount] HP = 
+when below [amount] HP = quando abaixo de [amount] HP
  # Requires translation!
 with [amount] to [amount2] neighboring [tileFilter] tiles = 
  # Requires translation!
@@ -7686,28 +7689,28 @@ Reveal up to [amount/'all'] [tileFilter] within a [amount] tile radius =
  # Requires translation!
 From a randomly chosen tile [amount] tiles away from the ruins, reveal tiles up to [amount2] tiles away with [amount3]% chance = 
  # Requires translation!
-This Unit gains [amount] XP = 
+This Unit gains [amount] XP = Esta Unidade recebe [amount] de XP
  # Requires translation!
-This Unit upgrades for free including special upgrades = 
+This Unit upgrades for free including special upgrades = Esta Unidade melhora de graça incluindo aprimoramentos especiais
  # Requires translation!
-This Unit gains the [promotion] promotion = 
+This Unit gains the [promotion] promotion = Esta Unidade ganha a promoção [promotion]
  # Requires translation!
-Hidden before founding a Pantheon = 
+Hidden before founding a Pantheon = Escondido antes de fundar um Panteão
  # Requires translation!
-Hidden after founding a Pantheon = 
+Hidden after founding a Pantheon = Escondido depois de fundar um Panteão
  # Requires translation!
-Hidden after generating a Great Prophet = 
+Hidden after generating a Great Prophet = Escondido depois de gerar um Grande Profeta
  # Requires translation!
-Triggerable = 
+Triggerable = Acionável
 Global = Global
 Nation = Nação
 Era = Era
 Tech = Tecno
 Policy = Política
  # Requires translation!
-FounderBelief = 
+FounderBelief = Crença Fundadora
  # Requires translation!
-FollowerBelief = 
+FollowerBelief = Crença do Seguidor
 Building = Construção
 Unit = Unidade
 UnitType = Tipo de Unidade

android/assets/jsons/translations/French.properties

@@ -576,7 +576,7 @@ Minutes = Minutes
 Hours = Heures
 Days = Jours
  # Requires translation!
-Server limit reached! Please wait for [time] seconds = 
+Server limit reached! Please wait for [time] seconds = Limite de serveur atteinte ! Veuillez patienter [time] secondes
 
 # Save game menu
 
@@ -690,7 +690,7 @@ Cannot provide unit upkeep for [unitName] - unit has been disbanded! = Impossibl
 [cityName] has grown! = [cityName] a gagné un citoyen !
 [cityName] is starving! = [cityName] est affamée !
 [construction] has been built in [cityName] = [construction] a été construit(e) à [cityName]
-[wonder] has been built in a faraway land = [wonder] a été construit(e) dans un pays lointain
+[wonder] has been built in a faraway land = [wonder] a été construit(e) sur des terres lointaines
 [civName] has completed [construction]! = [civName] a terminé [construction] !
 An unknown civilization has completed [construction]! = Une civilisation inconnue a terminé [construction] !
 The city of [cityname] has started constructing [construction]! = La ville de [cityname] a commencé à construire [construction] !
@@ -1122,7 +1122,7 @@ Demographics = Comparatif
 Demographic = Statistiques
 Rank = Rang
 Value = Valeur
-Best = Meilleur
+Best = Meilleure
 Average = Moyenne
 Worst = Pire
 Turns until the next\ndiplomacy victory vote: [amount] = Tours avant le prochain\nvote de victoire diplomatique : [amount]
@@ -1251,13 +1251,13 @@ Granted by: = Attribué par :
 Difficulty levels = Niveaux de difficulté
 The possible rewards are: = Les récompenses possibles sont :
  # Requires translation!
-Eras = 
+Eras = Ères
  # Requires translation!
-Embarked strength: [amount]† = 
+Embarked strength: [amount]† = Puissance embarquée : [amount]†
  # Requires translation!
-Base unit buy cost: [amount]¤ = 
+Base unit buy cost: [amount]¤ = Coût des unités de base : [amount]¤
  # Requires translation!
-Research agreement cost: [amount]¤ = 
+Research agreement cost: [amount]¤ = Coût des accords de recherche : [amount]¤
 
 
 S# Policies

android/assets/jsons/translations/Indonesian.properties

@@ -576,7 +576,7 @@ Minutes = Menit
 Hours = Jam
 Days = Hari
  # Requires translation!
-Server limit reached! Please wait for [time] seconds = 
+Server limit reached! Please wait for [time] seconds = Batas kapasitas server tercapai! Harap menunggu selama [time] detik
 
 # Save game menu
 
@@ -1251,13 +1251,13 @@ Granted by: = Diberikan oleh:
 Difficulty levels = Tingkat kesulitan
 The possible rewards are: = Kemungkinan hadiahnya adalah:
  # Requires translation!
-Eras = 
+Eras = Era
  # Requires translation!
-Embarked strength: [amount]† = 
+Embarked strength: [amount]† = Kekuatan saat melaut: [amount]†
  # Requires translation!
-Base unit buy cost: [amount]¤ = 
+Base unit buy cost: [amount]¤ = Biaya dasar untuk membeli unit: [amount]¤
  # Requires translation!
-Research agreement cost: [amount]¤ = 
+Research agreement cost: [amount]¤ = Biaya persetujuan riset: [amount]¤
 
 
 S# Policies

android/assets/jsons/translations/Italian.properties

@@ -579,8 +579,7 @@ Current Turn: [civName] since [time] [timeUnit] ago = Turno attuale: [civName] d
 Minutes = minuti
 Hours = ore
 Days = giorni
- # Requires translation!
+Server limit reached! Please wait for [time] seconds = Limite server raggiunto! Ti preghiamo di attendere [time] secondi
-Server limit reached! Please wait for [time] seconds = 
 
 # Save game menu
 
@@ -1255,14 +1254,10 @@ Granted by: = Donato da:
 [bonus] with [tech] = [bonus] con [tech]
 Difficulty levels = Livelli di difficoltà
 The possible rewards are: = Le ricompense possibili sono:
- # Requires translation!
+Eras = Epoche
-Eras = 
+Embarked strength: [amount]† = Forza imbarcata: [amount]†
- # Requires translation!
+Base unit buy cost: [amount]¤ = Costi d'acquisto unità base: [amount]¤
-Embarked strength: [amount]† = 
+Research agreement cost: [amount]¤ = Costi accordo di ricerca: [amount]¤
- # Requires translation!
-Base unit buy cost: [amount]¤ = 
- # Requires translation!
-Research agreement cost: [amount]¤ = 
 
 
 S# Policies

android/assets/jsons/translations/Simplified_Chinese.properties

@@ -577,8 +577,7 @@ Current Turn: [civName] since [time] [timeUnit] ago = 当前回合: [civName]
 Minutes = 分钟
 Hours = 小时
 Days = 天
- # Requires translation!
+Server limit reached! Please wait for [time] seconds = 服务器繁忙！请等待[time]秒
-Server limit reached! Please wait for [time] seconds = 
 
 # Save game menu
 
@@ -647,8 +646,7 @@ off = 关闭
 Show pixel units = 显示像素单位
 Show pixel improvements = 显示像素设施
 Enable Nuclear Weapons = 启用核武器
- # Requires translation!
+Experimental Demographics scoreboard = 新版排行榜(仍在开发中)
-Experimental Demographics scoreboard = 
 Show tile yields = 显示地块产出
 Show unit movement arrows = 显示单位移动箭头
 Continuous rendering = 连续渲染
@@ -1126,18 +1124,12 @@ Rankings = 排名
  # Feel free to replace it with a space and put it between other words in your translation
  # Requires translation!
 Demographics = 
- # Requires translation!
+Demographic = 分项
-Demographic = 
+Rank = 排名
- # Requires translation!
+Value = 数值
-Rank = 
+Best = 全球领先
- # Requires translation!
+Average = 平均水平
-Value = 
+Worst = 最落后
- # Requires translation!
-Best = 
- # Requires translation!
-Average = 
- # Requires translation!
-Worst = 
 Turns until the next\ndiplomacy victory vote: [amount] = 在下一次投票\n外交胜利票数：[amount]
 Choose a civ to vote for = 投票给所选文明
 Choose who should become the world leader and win a Diplomatic Victory! = 选择世界领袖并使其赢得外交胜利！
@@ -1210,7 +1202,7 @@ Movement cost = 移动力消耗
 for = ，当建造在拥有下列资源的地块上时：
 Missing translations: = 未翻译的词条：
 Resolution = 分辨率
-Tileset = 地块设置
+Tileset = 材质包
 Create = 创建
 Language = 语言设置
 Improvements = 设施
@@ -1263,14 +1255,13 @@ Granted by: = 授予由：
 [bonus] with [tech] = [bonus]（研发[tech]科技后）
 Difficulty levels = 游戏难度
 The possible rewards are: = 您可能会获得以下奖励
+Eras = 时代
  # Requires translation!
-Eras = 
+Embarked strength: [amount]† = 船载陆军单位防御：[amount]†
  # Requires translation!
-Embarked strength: [amount]† = 
+Base unit buy cost: [amount]¤ = 购买单位的成本基数：[amount]¤
  # Requires translation!
-Base unit buy cost: [amount]¤ = 
+Research agreement cost: [amount]¤ = 研究协议签订费用：[amount]¤
- # Requires translation!
-Research agreement cost: [amount]¤ = 
 
 
 S# Policies
@@ -3828,13 +3819,11 @@ Mine = 矿井
 Trading post = 贸易站
 
 Camp = 猎场
- # Requires translation!
+Can only be built to improve a resource = 仅能在可以获得资源的情况下建造
-Can only be built to improve a resource = 
 
 Oil well = 油井
 
- # Requires translation!
+Offshore Platform = 海上油井
-Offshore Platform = 
 
 Pasture = 牧场
 
@@ -5158,8 +5147,7 @@ Jerusalem = 耶路撒冷
 Provides a [buildingName] in your first [amount] cities for free = 前[amount]座城市免费获得一座[buildingName]
 
 
- # Requires translation!
+[stat] cost of purchasing items in cities [amount]%  = 在城市中购买物品的[stat][amount]% 
-[stat] cost of purchasing items in cities [amount]%  = 
 
 
 [relativeAmount]% Gold from Great Merchant trade missions = [relativeAmount]%来源于大商人贸易任务的金钱

buildSrc/src/main/kotlin/BuildConfig.kt

@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.6.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 709
+    const val appCodeNumber = 710
-    const val appVersion = "4.0.16"
+    const val appVersion = "4.0.17"
 
     const val gdxVersion = "1.11.0"
     const val roboVMVersion = "2.3.1"

changelog.md

@@ -1,3 +1,36 @@
+## 4.0.17
+
+Revert "Use kotlin coroutines instead of raw threads (+ refactorings) "
+
+Revert "Use kotlin coroutines instead of raw threads (+ refactorings) "
+
+Upgraded to libGDX 1.11.0 - resolves , resolves #5679
+
+By Azzurite:
+- Mark Unciv as an application that may use more memory than usual 
+- Use kotlin coroutines instead of raw threads (+ refactorings) 
+- Bump kotlin language version to latest 1.6.21 
+
+Possibility to liberate a traded city  - By JackRainy
+
+By xlenstra:
+- Disabled CS buttons when at war; CS keep influence when at war with ally 
+- Fixed a bug where roads could no longer be removed 
+
+By SomeTroglodyte:
+- Accelerate custom map selection a tiny bit 
+- Allow editor to generate rectangular Deciv redux maps 
+- Minor Map Editor improvements 
+- Fix TabbedPager stealing arrow keys from TextFields 
+- Crash Report omits GameInfo stuff when crashing from MainMenu, MapEditor or Options 
+- Notifications not scrollable far enough after in-turn notifications got added 
+
+By touhidurrr:
+- Suggest Temurin Instead of Zulu 
+- Enable gradle caching for faster CI runs 
+
+Capital movement tweaks  - By OptimizedForDensity
+
 ## 4.0.16
 
 AI will not declare war if it definitely can't take a city 

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

@@ -0,0 +1,33 @@
+## 4.0.17
+
+Revert "Use kotlin coroutines instead of raw threads (+ refactorings) "
+
+Revert "Use kotlin coroutines instead of raw threads (+ refactorings) "
+
+Upgraded to libGDX 1.11.0 - resolves , resolves #5679
+
+By Azzurite:
+- Mark Unciv as an application that may use more memory than usual 
+- Use kotlin coroutines instead of raw threads (+ refactorings) 
+- Bump kotlin language version to latest 1.6.21 
+
+Possibility to liberate a traded city  - By JackRainy
+
+By xlenstra:
+- Disabled CS buttons when at war; CS keep influence when at war with ally 
+- Fixed a bug where roads could no longer be removed 
+
+By SomeTroglodyte:
+- Accelerate custom map selection a tiny bit 
+- Allow editor to generate rectangular Deciv redux maps 
+- Minor Map Editor improvements 
+- Fix TabbedPager stealing arrow keys from TextFields 
+- Crash Report omits GameInfo stuff when crashing from MainMenu, MapEditor or Options 
+- Notifications not scrollable far enough after in-turn notifications got added 
+
+By touhidurrr:
+- Suggest Temurin Instead of Zulu 
+- Enable gradle caching for faster CI runs 
+
+Capital movement tweaks  - By OptimizedForDensity
+