Version rollout (#12525)

* Bump version and create initial changelog entry * Update Latin translation (#12520) * Update translation * Update translation * Fix translation * Update translation * Update Brazilian_Portuguese.properties (#12518) * Update German translation (#12515) * Update Croatian.properties (#12513) * Update Croatian.properties * fix invalid placeholder * Update Croatian translation * revisited existing translation * Update 2 Croatian translation * Update 3 Croatian translation * check grammar and consistency of existing translation * Update 4 Croatian translation * Update 5 Croatian translation * fix invalid placeholders * fix missing placeholder * Update 6 Croatian translation * Update 7 Croatian translation * fix invalid placeholders * Update 8 Croatian translation * Translate buildings, difficulties and eras * check word usage consistency of existing translation * Partial translation of nations * Partial translation of nations 2 * finish translation of nations * fix typos and grammar for translation of nations * Translate policies, quests, ruins and specialists --------- Co-authored-by: yairm210 <[email protected]> Co-authored-by: sls1005 <[email protected]> Co-authored-by: Vitor Gabriel <[email protected]> Co-authored-by: mape6 <[email protected]> Co-authored-by: metablaster <[email protected]>
yairm210 · Nov 26, 2024 · 45e86fe · 45e86fe
1 parent 7fbdfd1
commit 45e86fe
Show file tree

Hide file tree

Showing 9 changed files with 2,671 additions and 2,630 deletions.
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -5742,8 +5742,7 @@ Recycling Center = Centro de reciclagem
 
 
 Great Firewall = Great Firewall
- # Requires translation!
-'Distrust and caution are the parents of security.' - Benjamin Franklin = 
+'Distrust and caution are the parents of security.' - Benjamin Franklin = 'Desconfiança e cautela são os pais da segurança.' - Benjamin Franklin
 
 CN Tower = Torre CN
 'Nothing travels faster than light with the possible exception of bad news, which obeys its own special rules.' - Douglas Adams = 'Nada viaja mais rápido que a luz com a possível exceção de más notícias, que obedecem a suas próprias regras especiais.' -Douglas Adams

diff --git a/android/assets/jsons/translations/Croatian.properties b/android/assets/jsons/translations/Croatian.properties
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
@@ -5736,8 +5736,7 @@ Recycling Center = Recycling-Zentrum
 
 
 Great Firewall = Große Firewall
- # Requires translation!
-'Distrust and caution are the parents of security.' - Benjamin Franklin = 
+'Distrust and caution are the parents of security.' - Benjamin Franklin = 'Misstrauen und Vorsicht sind die Eltern der Sicherheit.' - Benjamin Franklin
 
 CN Tower = CN Tower
 'Nothing travels faster than light with the possible exception of bad news, which obeys its own special rules.' - Douglas Adams = 'Nichts reist schneller als das Licht, mit der möglichen Ausnahme von schlechten Nachrichten, die ihren eigenen speziellen Regeln gehorchen.' – Douglas Adams

diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties
@@ -9250,7 +9250,7 @@ The city can no longer put up any resistance!\nHowever, to conquer it, you must
 After Conquering = Post Captum
 When conquering a city, you can choose to liberate, annex, puppet, or raze the city. = Quando urbem capias, possis eligere sic urbem liberes aut affigas aut exscindas aut municipium facias.
  # Requires translation!
-\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = 
+\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = \nUrbem liberare reddat eam eae possessori, det tibi additionem diplomaticam magnam cum eo!\n\nUrbem affigere det tibi omne imperium eae, sed etiam duplicet iram civium!\nHoc potest mitigari per aedificandum jus in urbe, quo ira civium reficiatur cottidiana.\n\nUrbem municipium facere indicet te sine imperio esse de productio de urbe.\nIsta urbs non augeat sumptum tuum technologiae vel dictati.\nMunicipium potest aliquando affigi, sed urbs affixa non potest refici municipium!\n\nUrbem exscindere omni gressu faciat eae multitudinem uno minorem donec exscissa sit!\nNon potes exscindere urbem quae est metropolis initialis alicujus civilizationis aut urbs sancta alicujus religionis.
 
 You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminately, so don't let your \n  civilian units go near them, and be careful of your scout! = Centuriam barbaram convenisti!\nBarbari indiscrete appugnant aliquem omnem,\nsic non permittas centuriis paganis tuis prope eos ire,\net cures exploratores tuos!
 
@@ -9315,36 +9315,36 @@ Be cautious when signing defensive pacts because they can bring you into wars th
 The AI is very careful and will not accept defensive pacts with less than 80 influence. = 
 
  # Requires translation!
-Not all nations are contending with you for victory.\nCity-States are nations that can't win, can't be traded with, and instead confer certain bonuses to friendly civilizations. = 
+Not all nations are contending with you for victory.\nCity-States are nations that can't win, can't be traded with, and instead confer certain bonuses to friendly civilizations. = Ne omnes populi cum te pro victoria contendunt.\nCivitates urbium sunt populi qui non possunt ferre victoriam nec possunt commercari sed magis donant amicis praemia aliqualia.
  # Requires translation!
-Instead, diplomatic relations with City-States are determined by Influence - a meter of 'how much the City-State likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = 
+Instead, diplomatic relations with City-States are determined by Influence - a meter of 'how much the City-State likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = Propinquitates diplomaticae cum civitatibus urbium magis cernuntur per influentiam - metrum de quantitate qua civitates urbium amant te.\nInfluentia potest adici per oppugnandum hostes eorum, liberandum urbis eorum, et dandum eis aliquantum solidorum.
  # Requires translation!
-Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = 
+Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Aliqualia praemia dentur quom sis super 30 influentiam.\nQuom habeas influentiam super 60 atque maximam cum eis, in civilizationibus omnibus, videaris socius eorum, et mereas ampliora praemia et accessionem mercium luxuriarum, et mercium de strategemate, in terris eorum.
 
  # Requires translation!
-While working the land is good, eventually your Citizens will want to Specialize. = 
+While working the land is good, eventually your Citizens will want to Specialize. = Cum operari agrum est bonum, cives tui tandem volent fieri specialistae.
  # Requires translation!
-Certain Buildings will also provide Specialist Slots. These slots will show up in the Citizen Management within the City Screen under Specialists. Each slot can be filled with a Citizen which will then become a Specialist. = 
+Certain Buildings will also provide Specialist Slots. These slots will show up in the Citizen Management within the City Screen under Specialists. Each slot can be filled with a Citizen which will then become a Specialist. = Aliquanta aedificia etiam praebent spatia specialistarum. Haec spatia appeant sub "specialistis" in  "administratione civium" in "ostentu urbis." Spatium omne potest impleri cive, qui tum fiat specialista.
  # Requires translation!
-Each Specialist will generate a certain amount of yield as indicated to the right of the available slots. = 
+Each Specialist will generate a certain amount of yield as indicated to the right of the available slots. = Specialista omnis generet tantum producti, quantum indicatur in loco dextro spatiorum parabilium.
  # Requires translation!
-While these are a great way to specialize the yield production of a City outside of the surrounding Tile Yields, Specialists have an additional value. Each one also generates Great Person Points each turn. With enough of them, a new Great Person will join your Nation. = 
+While these are a great way to specialize the yield production of a City outside of the surrounding Tile Yields, Specialists have an additional value. Each one also generates Great Person Points each turn. With enough of them, a new Great Person will join your Nation. = Cum haec sunt modus bonus quo productum urbis fiat speciale extra producta tegularum circumcurrentium, specialistae habent aestimationem addititiam. Omnis etiam gressu omni generat calculos personarum magnarum. Satis cum eis, nova persona magna cum populo tuo coeat.
 See also Great People = Et videas Personas Magnas
 
 Great People = Personæ Magnæ
  # Requires translation!
-Certain buildings, and specialists in cities, generate Great Person points per turn.\nThere are several types of Great People, and their points accumulate separately.\nThe number of points per turn and accumulated points can be viewed in the Overview screen. = 
+Certain buildings, and specialists in cities, generate Great Person points per turn.\nThere are several types of Great People, and their points accumulate separately.\nThe number of points per turn and accumulated points can be viewed in the Overview screen. = Aliquanta aedificia, et specialistae in urbibus, gressu omni generant calculos personarum magnarum.\nAliquanta sunt genera personarum magnarum, et calculi earum seorsum accumulantur.\nNumerus calculorum gressûs omnis et calculi accumulati possunt in ostentu breviarii videri.
  # Requires translation!
 Alternatively, the Great Person points breakdown per city can be viewed in each City Screen (see UI Tips article). = 
  # Requires translation!
-Once enough points have been accumulated, a Great Person of that type will be created!\nEach Great Person can construct a certain Great Improvement which gives large yields over time, or immediately consumed to provide a certain bonus now. = 
+Once enough points have been accumulated, a Great Person of that type will be created!\nEach Great Person can construct a certain Great Improvement which gives large yields over time, or immediately consumed to provide a certain bonus now. = Quando satis calculi sint accumulati, persona magna ejus generis creetur!\nPersona magna omnis potest construere aliqualem meliorationem magnam, quae paulatim det productum magnum, aut nunc confestim sumi ad praebendum praemium aliquale.
  # Requires translation!
 Great Improvements also provide any strategic resources that are under them, so you don't need to worry if resources are revealed underneath your improvements! = 
 See also Specialists = Et videas Specialistas
 
-Removing Terrain Features = Summovere Adjuncta Tegularum
+Removing Terrain Features = Summovere Adjuncta Humorum
  # Requires translation!
-Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to add improvements exploiting those resources. = 
+Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to add improvements exploiting those resources. = Aliquantae tegulae habent adjuncta humorum - similia sunt campis alluvialibus vel silvis - super se. Aliquantum horum coriorum, e.g. silva tropica, palus et silva, possunt ab opificibus summovere.\nSummovere adjunctum humi non summoveat mercem quae cumque in ea tegula est, et vulgo requiritur ad addendum meliorationes ut hae merces usurpentur.
 
  # Requires translation!
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, ⍾Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,8 +4,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.9.24"
     const val appName = "Unciv"
-    const val appCodeNumber = 1074
-    const val appVersion = "4.14.9"
+    const val appCodeNumber = 1075
+    const val appVersion = "4.14.10"
 
     const val gdxVersion = "1.12.1"
     const val ktorVersion = "2.3.12"

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,25 @@
+## 4.14.10
+
+Revert "Resolved  - Nat wonders land->water conversion no longer causes rivers on water tiles"
+
+Resolved  - fixed crash when swapping while retreating
+
+Resolved  - debug option to show tile image locations
+
+console: Don't allow adding cities to spectator/barbarian (will crash)
+
+Resolved  - Worker units do not try and swap with non-adjacent tiles
+
+Allow MP updates to catch Throwable, which includes OutOfMemoryError
+
+Resolved MP update task concurrent modification exception
+
+Resolved crashes due to incorrect music state - no idea what's actually causing it, but the entire music track handling needs a revamp anyway
+
+Resolved  - console cannot change player type for non-major civs
+
+Adding Dollar Sign  - By itanasi
+
 ## 4.14.9
 
 CPU performance improvements

diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
@@ -483,7 +483,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
 
     companion object {
         //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
-        val VERSION = Version("4.14.9", 1074)
+        val VERSION = Version("4.14.10", 1075)
         //endregion
 
         /** Global reference to the one Gdx.Game instance created by the platform launchers - do not use without checking [isCurrentInitialized] first. */

diff --git a/fastlane/metadata/android/en-US/changelogs/1075.txt b/fastlane/metadata/android/en-US/changelogs/1075.txt
@@ -0,0 +1,21 @@
+
+
+Revert "Resolved  - Nat wonders land->water conversion no longer causes rivers on water tiles"
+
+Resolved  - fixed crash when swapping while retreating
+
+Resolved  - debug option to show tile image locations
+
+console: Don't allow adding cities to spectator/barbarian (will crash)
+
+Resolved  - Worker units do not try and swap with non-adjacent tiles
+
+Allow MP updates to catch Throwable, which includes OutOfMemoryError
+
+Resolved MP update task concurrent modification exception
+
+Resolved crashes due to incorrect music state - no idea what's actually causing it, but the entire music track handling needs a revamp anyway
+
+Resolved  - console cannot change player type for non-major civs
+
+Adding Dollar Sign  - By itanasi
diff --git a/fastlane/metadata/android/hr/full_description.txt b/fastlane/metadata/android/hr/full_description.txt
@@ -1,13 +1,13 @@
 Reimplementacija najpoznatije igre za izgradnju civilizacije otvorenog koda - brza, mala, bez oglasa, besplatna zauvijek!
 
-Izgradite svoju civilizaciju, istražite tehnologije, proširite svoje gradove i porazite svoje neprijatelje!
+Izgradi svoju civilizaciju, istraži tehnologije, proširi svoje gradove i porazi svoje neprijatelje!
 
-Zahtjevi? greške? Želite li pomoći razvoju? Popis obaveza za aplikaciju je https://github.com/yairm210/Unciv/issues
+Zahtjevi? greške? Želiš li pomoći razvoju? Popis obaveza za aplikaciju je na <a href="https://github.com/yairm210/Unciv/issues">GitHub Issues</a>
 
-Pitanja? Komentari? Pridružite nam se na Diskordu na https://discord.gg/bjrB4Xw ;)
+Pitanja? Komentari? Pridruži nam se na Diskordu na <a href="https://discord.gg/bjrB4Xw">Discord</a> ;)
 
-Želite li pomoći u prevođenju igre na vaš jezik? Pogledajte https://yairm210.github.io/Unciv/Other/Translating/
+Želiš li pomoći u prevođenju igre na svoj jezik? Pogledaj <a href="https://yairm210.github.io/Unciv/Other/Translating">Wiki</a>
 
-Svijet čeka! Hoćete li izgraditi svoju civilizaciju u carstvo koje će izdržati test vremena?
+Svijet čeka! Hoćeš li izgraditi svoju civilizaciju u carstvo koje će izdržati test vremena?
 
-Dopuštenje 'imaj puni pristup mreži' potrebno je za preuzimanja koja pokreće korisnik i značajku za više igrača. Sva ostala navedena dopuštenja su automatski uključena od strane API-a koji se koristi za implementaciju obavijesti o potezu više igrača. Mrežna dopuštenja koriste se za popis modova, preuzimanje modova, preuzimanje glazbe i za slanje/preuzimanje igara za više igrača. Niti jedna druga internetska komunikacija nije pokrenuta od strane Unciv.
+Dopuštenje 'imaj puni pristup mreži' potrebno je za preuzimanja koja pokreće korisnik i značajku za više igrača. Sva ostala navedena dopuštenja su automatski uključena od strane API-a koji se koristi za implementaciju obavijesti o potezima više igrača. Mrežna dopuštenja koriste se za popis modova, preuzimanje modova, preuzimanje glazbe i za slanje/preuzimanje igara za više igrača. Niti jedna druga internetska komunikacija nije pokrenuta od strane Unciv.