From ec5dfd1e5f746966b0933d44cebe0724bf80ee02 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 26 Jan 2025 11:43:17 +0200 Subject: [PATCH] Version rollout (#12861) * Bump version and create initial changelog entry * Update Brazilian_Portuguese.properties (#12860) * Update Brazilian_Portuguese.properties * Update Brazilian_Portuguese.properties * Update Spanish.properties (#12856) * Update German translation (#12855) * Update French.properties (#12854) * translate new lines and minor fix (#12852) * Update Indonesian.properties (#12851) * Update Italian.properties (#12850) --------- Co-authored-by: yairm210 Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: Nahuel Geno <142752140+NahuelGeno@users.noreply.github.com> Co-authored-by: mape6 Co-authored-by: Ouaz Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com> Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 8 ++--- .../jsons/translations/Croatian.properties | 19 ++++++------ .../jsons/translations/French.properties | 4 +-- .../jsons/translations/German.properties | 6 ++-- .../jsons/translations/Indonesian.properties | 6 ++-- .../jsons/translations/Italian.properties | 9 ++---- .../jsons/translations/Spanish.properties | 6 ++-- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +-- changelog.md | 30 +++++++++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../android/en-US/changelogs/1094.txt | 29 ++++++++++++++++++ 11 files changed, 86 insertions(+), 37 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/1094.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index e007ccf984..ff558f4022 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2201,9 +2201,8 @@ Remove extra unhappiness from annexed cities = Remove infelicidade extra das cid Connects trade routes over water = Conecta rotas comerciais marítimas Automatically built in all cities where it is buildable = Construído automaticamente em todas as cidades onde é edificável Creates a [improvementName] improvement on a specific tile = Cria uma melhoria [improvementName] em um painel específico -Founds a new city = Estabelecer uma nova cidade - # Requires translation! -Founds a new puppet city = +Founds a new city = Funda uma nova cidade +Founds a new puppet city = Funda uma nova cidade fantoche Can instantly construct a [improvementFilter] improvement = Pode construir instantaneamente uma melhoria [improvementFilter] May create improvements on water resources = Pode criar melhorias em recursos aquáticos Can build [improvementFilter/terrainFilter] improvements on tiles = Pode construir melhorias [improvementFilter/terrainFilter] em painéis @@ -2379,8 +2378,7 @@ for [civFilter] Civilizations = para [civFilter] Civilizações when at war = quando em guerra when not at war = quando não está em guerra during a Golden Age = durante uma Era de Ouro - # Requires translation! -when not in a Golden Age = +when not in a Golden Age = quando não estiver em uma Era de Ouro during We Love The King Day = durante o dia de Nós Amamos o Rei while the empire is happy = enquanto o império está feliz when between [amount] and [amount2] Happiness = quando entre [amount] e [amount2] de Felicidade diff --git a/android/assets/jsons/translations/Croatian.properties b/android/assets/jsons/translations/Croatian.properties index 212c1965e0..6bfc58eebb 100644 --- a/android/assets/jsons/translations/Croatian.properties +++ b/android/assets/jsons/translations/Croatian.properties @@ -1534,7 +1534,7 @@ Civilization Info = Informacije o Civilizaciji Relations = Odnosi Trade request = Trgovinska zamolba Garrisoned by unit = S jedinicom u garnizonu -Status\n(puppet, resistance or being razed) = Status\n(marioneta, otpor ili uništenje) +Status\n(puppet, resistance or being razed) = Status\n(marioneta, otpor ili rušenje) # Victory @@ -1594,17 +1594,17 @@ Annexed cities become part of your regular empire. = Pripojeni gradovi postaju d Their citizens generate 2x the unhappiness, unless you build a courthouse. = Njihovi građani generiraju 2x više nezadovoljstva, osim ako ne izgradite sudnicu. Your civilization may not annex this city. = Vaša civilizacija ne može pripojiti ovaj grad. Puppet = Marioneta -Puppeted cities do not increase your tech or policy cost. = Marionete ne povećavaju vašu cijenu tehnologije ili politike. +Puppeted cities do not increase your tech or policy cost. = Gradovi marionete ne povećavaju vašu cijenu tehnologije ili politike. You have no control over the the production of puppeted cities. = Nemate kontrolu nad proizvodnjom gradova marioneta. Puppeted cities also generate 25% less Gold and Science. = Gradovi marionete također generiraju 25% manje zlata i znanosti. A puppeted city can be annexed at any time. = Grad marioneta može se pripojiti bilo kada. Liberate (city returns to [originalOwner]) = Oslobodi (grad se vraća u [originalOwner]) Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Oslobađanje grada vraća ga njegovom izvornom vlasniku, dajući vam ogroman poticaj odnosa s njim! Raze = Sruši -Razing the city annexes it, and starts burning the city to the ground. = Uništavanje grada pripaja ga i počinje spaljivati grad do temelja. -Razing the city puppets it, and starts burning the city to the ground. = Uništavanje grada čini ga marionetom, i počinje spaljivati grad do temelja. +Razing the city annexes it, and starts burning the city to the ground. = Rušenje grada pripaja ga i počinje spaljivati grad do temelja. +Razing the city puppets it, and starts burning the city to the ground. = Rušenje grada čini ga marionetom, i počinje spaljivati grad do temelja. The population will gradually dwindle until the city is destroyed. = Stanovništvo će se postupno smanjivati dok grad ne bude uništen. -Original capitals and holy cities cannot be razed. = Izvorne prijestolnice i sveti gradovi ne mogu se uništiti. +Original capitals and holy cities cannot be razed. = Izvorne prijestolnice i sveti gradovi ne mogu se srušiti. Destroy = Uništi Destroying the city instantly razes the city to the ground. = Uništavanje grada instantno sravnjuje grad sa zemljom. Keep it = Zadrži ga @@ -2162,7 +2162,7 @@ Starts with [tech] = Počinje s [tech] Starts with [policy] adopted = Počinje s usvojenom [policy] Triggers victory = Okida pobjedu Triggers a Cultural Victory upon completion = Pokreće Kulturnu Pobjedu po završetku -May buy items in puppet cities = Mogu se kupovati stavke u marionetama +May buy items in puppet cities = Mogu se kupovati stavke u marionetskim gradovima May not annex cities = Ne može se pripajati gradove "Borrows" city names from other civilizations in the game = "Posuđuje" imena gradova od drugih civilizacija u igri Cities are razed [amount] times as fast = Gradovi se [amount] puta brže ruše @@ -2203,7 +2203,7 @@ Automatically built in all cities where it is buildable = Automatski se gradi u Creates a [improvementName] improvement on a specific tile = Stvara unaprjeđenje [improvementName] na određenom polju Founds a new city = Osniva novi grad # Requires translation! -Founds a new puppet city = +Founds a new puppet city = Osniva novi marionetski grad Can instantly construct a [improvementFilter] improvement = Može se instantno izgraditi unaprjeđenje [improvementFilter] May create improvements on water resources = Može stvoriti unaprjeđenja na resursima na vodi Can build [improvementFilter/terrainFilter] improvements on tiles = Može graditi [improvementFilter/terrainFilter] unaprjeđenja na poljima @@ -2380,7 +2380,7 @@ when at war = kad je u ratu when not at war = kad nije u ratu during a Golden Age = u Zlatno Doba # Requires translation! -when not in a Golden Age = +when not in a Golden Age = kada nije u Zlatnom Dobu during We Love The King Day = za vrijeme Volimo Kralja while the empire is happy = sve dok je carstvo zadovoljno when between [amount] and [amount2] Happiness = kada je između [amount] i [amount2] Zadovoljstva @@ -2637,7 +2637,7 @@ in foreign cities = u stranim gradovima Foreign = Strani in annexed cities = u pripojenim gradovima Annexed = Pripojeno -in puppeted cities = u marionetama +in puppeted cities = u marionetskim gradovima Puppeted = Marioneta in resisting cities = u gradovima s otporom Resisting = Opire se @@ -7187,4 +7187,3 @@ Forest and Jungle Visibility\nIn Unciv, forests and jungles are visible 1 tile o Founding Cities\nThe Settler is a unit that can found a new city. You can build a Settler unit in a city with at least 2 population, and then move them to a good location to found a new city. This will usually be your main way of acquiring more cities. = Osnivanje gradova\nNaseljenik je jedinica koja može osnovati novi grad. Možete izgraditi jedinicu Naseljenika u gradu s najmanje 2 stanovnika, a zatim ih premjestiti na dobru lokaciju kako biste osnovali novi grad. To će obično biti vaš glavni način stjecanja više gradova. Food conversion to Production\nDuring the construction of a Settler, the city will not grow. Instead, the 1st, 2nd, 4th, and from there on every 4th, excess Food (Growth) is converted into Production, with the rest of the excess Food being lost. = Pretvorba hrane u proizvodnju\nTijekom izgradnje Naseljenika, grad neće rasti. Umjesto toga, 1., 2., 4., a odatle svaki 4., višak Hrane (Rast) pretvara se u Proizvodnju, a ostatak viška Hrane se gubi. - diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 207d7656b9..62f44046ab 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2203,7 +2203,7 @@ Automatically built in all cities where it is buildable = Construit(e) automatiq Creates a [improvementName] improvement on a specific tile = Crée un aménagement [improvementName] sur une case spécifique Founds a new city = Fonde une nouvelle ville # Requires translation! -Founds a new puppet city = +Founds a new puppet city = Fonde une nouvelle ville fantoche Can instantly construct a [improvementFilter] improvement = Peut construire instantanément un(e) [improvementFilter] May create improvements on water resources = Peut créer des aménagements de ressources aquatiques Can build [improvementFilter/terrainFilter] improvements on tiles = Peut bâtir des aménagements [improvementFilter/terrainFilter] sur les cases @@ -2380,7 +2380,7 @@ when at war = quand en guerre when not at war = quand en paix during a Golden Age = durant un Âge d'Or # Requires translation! -when not in a Golden Age = +when not in a Golden Age = en n'étant pas dans un Âge d'Or during We Love The King Day = pendant la Fête du Roi while the empire is happy = quand l'empire est heureux when between [amount] and [amount2] Happiness = quand entre [amount] et [amount2] Bonheur diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 638f2c8947..da413a1430 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2202,8 +2202,7 @@ Connects trade routes over water = Verbindet Handelsrouten über Wasser Automatically built in all cities where it is buildable = Automatisch gebaut in allen Städten, in denen es gabeut werden kann Creates a [improvementName] improvement on a specific tile = Erschafft eine [improvementName] Verbesserung auf einem bestimmten Feld Founds a new city = Gründet eine neue Stadt - # Requires translation! -Founds a new puppet city = +Founds a new puppet city = Gründet eine neue Marionettenstadt Can instantly construct a [improvementFilter] improvement = Kann sofort eine [improvementFilter] Verbesserung bauen May create improvements on water resources = Kann Verbesserungen auf Ressourcen im Wasser bauen Can build [improvementFilter/terrainFilter] improvements on tiles = Kann [improvementFilter/terrainFilter] Verbesserungen auf Feldern bauen @@ -2379,8 +2378,7 @@ for [civFilter] Civilizations = für [civFilter] Zivilisationen when at war = wenn im Krieg when not at war = wenn nicht im Krieg during a Golden Age = während eines Goldenen Zeitalters - # Requires translation! -when not in a Golden Age = +when not in a Golden Age = wenn nicht in einem Goldenen Zeitalter during We Love The King Day = während 'Wir lieben den König'-Tag while the empire is happy = solange die Bevölkerung glücklich ist when between [amount] and [amount2] Happiness = wenn zwischen [amount] und [amount2] Zufriedenheit diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 5b3c18dbae..0e72f99443 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2065,7 +2065,7 @@ Provides a unique luxury = Menyediakan sumber daya mewah unik Military Units gifted from City-States start with [amount] XP = Unit militer yang diberikan oleh Negara-Kota memulai dengan [amount] XP Militaristic City-States grant units [amount] times as fast when you are at war with a common nation = Negara-Kota Militeristik memberikan unit [amount] kali lipat lebih cepat ketika kamu sama-sama berperang melawan musuh yang sama Gifts of Gold to City-States generate [relativeAmount]% more Influence = Pemberian Emas ke Negara-Kota menghasilkan [relativeAmount]% lebih banyak Pengaruh -Can spend Gold to annex or puppet a City-State that has been your Ally for [amount] turns = Dapat menghabiskan Emas untuk menganeksasi atau menjadikan Negara-Kota yang telah menjadi Sekutumu sebagai boneka selama [amount] giliran +Can spend Gold to annex or puppet a City-State that has been your Ally for [amount] turns = Dapat mengeluarkan Emas untuk menganeksasi atau menjadikan Negara-Kota yang telah menjadi Sekutumu sebagai boneka selama [amount] giliran City-State territory always counts as friendly territory = Wilayah Negara-Kota selalu dihitung sebagai wilayah bersahabat Allied City-States will occasionally gift Great People = Negara-Kota Sekutu akan secara berkala memberikan Orang Hebat Will not be chosen for new games = Tidak akan dipilih untuk permainan baru @@ -2203,7 +2203,7 @@ Automatically built in all cities where it is buildable = Otomatis dibangun di s Creates a [improvementName] improvement on a specific tile = Membuat peningkatan [improvementName] di ubin yang spesifik Founds a new city = Mendirikan kota baru # Requires translation! -Founds a new puppet city = +Founds a new puppet city = Mendirikan kota boneka baru Can instantly construct a [improvementFilter] improvement = Bisa langsung membangun peningkatan [improvementFilter] May create improvements on water resources = Dapat membuat peningkatan di sumber daya air Can build [improvementFilter/terrainFilter] improvements on tiles = Dapat membangun peningkatan [improvementFilter/terrainFilter] di ubin @@ -2380,7 +2380,7 @@ when at war = saat sedang berperang when not at war = saat tidak sedang berperang during a Golden Age = selama Masa Kejayaan # Requires translation! -when not in a Golden Age = +when not in a Golden Age = saat tidak berada di dalam Masa Kejayaan during We Love The King Day = selama Hari Kami Mencintai Raja while the empire is happy = selama kekaisaran sedang bahagia when between [amount] and [amount2] Happiness = saat memiliki antara [amount] dan [amount2] Kebahagiaan diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index fed689077e..58ef86df02 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2208,8 +2208,7 @@ Connects trade routes over water = Consente le rotte commerciali marittime Automatically built in all cities where it is buildable = Costruito automaticamente in tutte le città dove è costruibile Creates a [improvementName] improvement on a specific tile = Crea un miglioramento [improvementName] su una casella specifica Founds a new city = Può fondare una nuova città - # Requires translation! -Founds a new puppet city = +Founds a new puppet city = Fonda una nuova città fantoccio Can instantly construct a [improvementFilter] improvement = Può costruire instantaneamente un miglioramento [improvementFilter] May create improvements on water resources = Può costruire miglioramenti sulle risorse acquatiche Can build [improvementFilter/terrainFilter] improvements on tiles = Può costruire miglioramenti [improvementFilter/terrainFilter] @@ -2385,8 +2384,7 @@ for [civFilter] Civilizations = per le civiltà [civFilter] when at war = quando sei in guerra when not at war = quando non sei in guerra during a Golden Age = durante un'Età dell'Oro - # Requires translation! -when not in a Golden Age = +when not in a Golden Age = al di fuori di un'Età dell'Oro during We Love The King Day = durante la festa Viva il Re while the empire is happy = mentre l'impero è felice when between [amount] and [amount2] Happiness = se la Felicità è tra [amount] e [amount2] @@ -2768,8 +2766,7 @@ Tutorial = Tutorial CityState = Città-Stato ModOptions = Opzioni Mod Event = Evento - # Requires translation! -EventChoice = +EventChoice = Scelte Evento Conditional = Condizionale TriggerCondition = Condizione di Attivazione UnitTriggerCondition = Condizione di Attivazione Unità diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index bbaa0080da..235ac32af4 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -2202,8 +2202,7 @@ Connects trade routes over water = Conecta rutas de comercio por el agua Automatically built in all cities where it is buildable = Construído automáticamente en todas las ciudades donde sea posible. Creates a [improvementName] improvement on a specific tile = Crea una mejora de [improvementName] en una casilla específica Founds a new city = Funda una nueva ciudad - # Requires translation! -Founds a new puppet city = +Founds a new puppet city = Funda una nueva ciudad títere Can instantly construct a [improvementFilter] improvement = Puede construir una mejora de [improvementFilter] de inmediato May create improvements on water resources = Puede crear mejoras en recursos acuáticos Can build [improvementFilter/terrainFilter] improvements on tiles = Puede eregir: [improvementFilter/terrainFilter] @@ -2379,8 +2378,7 @@ for [civFilter] Civilizations = para [civFilter] Civilizaciones when at war = si está en guerra when not at war = si no está en guerra during a Golden Age = durante una Edad Dorada - # Requires translation! -when not in a Golden Age = +when not in a Golden Age = cuando no estás en una edad de oro during We Love The King Day = durante el Día de Amamos al Rey while the empire is happy = mientras el imperio es feliz when between [amount] and [amount2] Happiness = cuando esté entre [amount] y [amount2] Felicidad diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 437c8686b5..cab211e73f 100644 --- 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 = 1093 - const val appVersion = "4.15.4" + const val appCodeNumber = 1094 + const val appVersion = "4.15.5" const val gdxVersion = "1.13.1" const val ktorVersion = "2.3.12" diff --git a/changelog.md b/changelog.md index bf8de0d778..af55610703 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,33 @@ +## 4.15.5 + +Prerender the "pillaged improvement" icon as well + +perf(render): Converted improvement images to prerendered images + +perf(render): Separate improvement icons to different layer + +perf(render): Create dynamic texture for resources so swaps are only done on resource layer when we need the number (strategic resources) + +chore: Genericify on-the-fly texture packing to be source agnostic + +chore: Stat image setup separated to a distinct function - we don't need to keep it around! + +perf(render): Separate resource icons into separate layer + +Correctly reset pixmap packer when loading a new ruleset + +perf(render): Yields rendered from a dynamically created texture + +perf(render): Separate yields to different tile layer + +chore: Added debug passthrough functions to rendered elements + +Resolved - Automation handles "Found City" uniques with limited uses correctly + +By sulai: +- UnitTable: show a summary when no unit is selected +- Fix sticky tooltips + ## 4.15.4 Greeting stats translated correctly in notifications diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 6455462ddf..d8081f2b95 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -487,7 +487,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.15.4", 1093) + val VERSION = Version("4.15.5", 1094) //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/1094.txt b/fastlane/metadata/android/en-US/changelogs/1094.txt new file mode 100644 index 0000000000..a779e29923 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1094.txt @@ -0,0 +1,29 @@ + + +Prerender the "pillaged improvement" icon as well + +perf(render): Converted improvement images to prerendered images + +perf(render): Separate improvement icons to different layer + +perf(render): Create dynamic texture for resources so swaps are only done on resource layer when we need the number (strategic resources) + +chore: Genericify on-the-fly texture packing to be source agnostic + +chore: Stat image setup separated to a distinct function - we don't need to keep it around! + +perf(render): Separate resource icons into separate layer + +Correctly reset pixmap packer when loading a new ruleset + +perf(render): Yields rendered from a dynamically created texture + +perf(render): Separate yields to different tile layer + +chore: Added debug passthrough functions to rendered elements + +Resolved - Automation handles "Found City" uniques with limited uses correctly + +By sulai: +- UnitTable: show a summary when no unit is selected +- Fix sticky tooltips \ No newline at end of file