From 3879f18288cc38723e22c6e409c48a7107110928 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 14 May 2023 21:55:54 +0300 Subject: [PATCH] Version rollout (#9388) * Bump version and create initial changelog entry * Update Italian.properties (#9381) * Update Italian.properties * Update Italian.properties * Update French.properties (#9378) * Update Polish.properties (#9377) * Updated Brazilian_Portuguese.properties (#9376) * Update German translation (#9373) --------- Co-authored-by: yairm210 Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: Ouaz Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: mape6 --- .../translations/Brazilian_Portuguese.properties | 9 +++------ .../assets/jsons/translations/French.properties | 10 +++++----- .../assets/jsons/translations/German.properties | 9 +++------ .../assets/jsons/translations/Italian.properties | 11 ++++------- .../assets/jsons/translations/Polish.properties | 6 +++--- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- changelog.md | 16 ++++++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/867.txt | 15 +++++++++++++++ 9 files changed, 52 insertions(+), 30 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/867.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 9fee50c466..cdcd321707 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1411,8 +1411,7 @@ What would you like to do with the city of [cityName]? = O que você gostaria de Annex = Anexar Annexed cities become part of your regular empire. = Cidades anexadas se tornam parte de seu império regular. Their citizens generate 2x the unhappiness, unless you build a courthouse. = Seus cidadãos geram 2x infelicidade, a menos que você construa um tribunal. - # Requires translation! -Your civilization may not annex this city. = +Your civilization may not annex this city. = Sua civilização não pode anexar esta cidade. Puppet = Fantoche Puppeted cities do not increase your tech or policy cost. = Cidades marionetes não aumentam seu custo de tecnologia ou política. You have no control over the the production of puppeted cities. = Você não tem controle sobre a produção de Cidades Fantoche. @@ -1422,8 +1421,7 @@ Liberate (city returns to [originalOwner]) = Liberar (a cidade retorna a [origin Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Libertar uma cidade retorna-a para seu proprietário original, dando a você um enorme impulso de relacionamento com ele! Raze = Queimar Razing the city annexes it, and starts burning the city to the ground. = Queimar a cidade a anexa, e ela começa a ser queimada á cinzas. - # Requires translation! -Razing the city puppets it, and starts burning the city to the ground. = +Razing the city puppets it, and starts burning the city to the ground. = Queimar a cidade, marionetes e começa a queimar a cidade até o chão. The population will gradually dwindle until the city is destroyed. = A população diminuirá gradualmente até a cidade ser destruída. Original capitals and holy cities cannot be razed. = Capitais originais e cidades santas não podem ser queimadas. Destroy = Destruir @@ -1898,8 +1896,7 @@ Land units may cross [terrainName] tiles after the first [baseUnitFilter] is ear Gain [amount] Influence with a [baseUnitFilter] gift to a City-State = Ganhe [amount] Influência com um presente [baseUnitFilter] para uma cidade-estado [relativeAmount]% Faith cost of generating Great Prophet equivalents = [relativeAmount]% custo de fé para gerar equivalentes do Grande Profeta Resting point for Influence with City-States following this religion [amount] = Ponto de descanso para Influência com Cidades-Estado seguindo esta religião [amount] - # Requires translation! -May not annex cities = +May not annex cities = Não pode anexar cidades Provides a sum of gold each time you spend a Great Person = Proporciona um montante de Ouro a cada vez que você admitir uma Grande Personalidade [stats] whenever a Great Person is expended = [stats] sempre que uma Grande Pessoa é gasta Receive free [unit] when you discover [tech] = Receba um [unit] gratuito quando é descoberto um [tech] diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index d4ed3e347b..2cb2d1ee1e 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1412,7 +1412,7 @@ Annex = Annexer Annexed cities become part of your regular empire. = Les villes annexées sont intégrées à votre empire. Their citizens generate 2x the unhappiness, unless you build a courthouse. = Leurs citoyens génèrent un mécontentement x2, à moins de construire un tribunal. # Requires translation! -Your civilization may not annex this city. = +Your civilization may not annex this city. = Votre civilisation ne peut pas annexer cette ville. Puppet = Fantochiser Puppeted cities do not increase your tech or policy cost. = Les villes fantoches n'augmentent pas vos coûts en technologies ou doctrines. You have no control over the the production of puppeted cities. = Vous ne contrôlez pas la production des villes fantoches. @@ -1421,9 +1421,9 @@ A puppeted city can be annexed at any time. = Une ville fantoche peut être anne Liberate (city returns to [originalOwner]) = Libérer (rendre la ville à [originalOwner]) Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Libérer une ville la restitue à son propriétaire initial, ce qui améliore grandement votre relation avec ce dernier ! Raze = Raser -Razing the city annexes it, and starts burning the city to the ground. = Raser une ville l'annexe, puis la détruit entièrement. +Razing the city annexes it, and starts burning the city to the ground. = Raser une ville l'annexe, puis la détruit progressivement. # Requires translation! -Razing the city puppets it, and starts burning the city to the ground. = +Razing the city puppets it, and starts burning the city to the ground. = Raser une ville la fantochise, puis la détruit progressivement. The population will gradually dwindle until the city is destroyed. = La population de la ville diminuera progressivement jusqu'à destruction complète. Original capitals and holy cities cannot be razed. = Les capitales d'origine et les villes saintes ne peuvent pas être rasées. Destroy = Détruire @@ -1886,7 +1886,7 @@ Notified of new Barbarian encampments = Notification pour les nouveaux campement Unhappiness from number of Cities doubled = Mécontentement dû au nombre de villes doublé Great General provides double combat bonus = Un Grand Général fournit un bonus de combat doublé Receive a tech boost when scientific buildings/wonders are built in capital = Reçoit un bonus technologique lors de la construction de bâtiments/merveilles scientifiques dans la capitale -May not generate great prophet equivalents naturally = Peut ne pas générer l'équivalent des grands prophètes naturellement +May not generate great prophet equivalents naturally = Ne peut pas générer l'équivalent des grands prophètes naturellement When conquering an encampment, earn [amount] Gold and recruit a Barbarian unit = Lors de la conquête d'un campement, gagne [amount] Or et recrute une unité Barbare When defeating a [mapUnitFilter] unit, earn [amount] Gold and recruit it = Une unité [mapUnitFilter] vaincue rapporte [amount] Or et recrute l'unité Receive triple Gold from Barbarian encampments and pillaging Cities = Recevoir le triple d'Or des campements barbares et du pillage des villes @@ -1899,7 +1899,7 @@ Gain [amount] Influence with a [baseUnitFilter] gift to a City-State = Gagne [am [relativeAmount]% Faith cost of generating Great Prophet equivalents = [relativeAmount]% coût en Foi pour générer l'équivalent de Grand Prophète Resting point for Influence with City-States following this religion [amount] = Point d'équilibre de l'Influence pour les Cités-États pratiquant cette religion [amount] # Requires translation! -May not annex cities = +May not annex cities = Ne peut pas annexer les villes Provides a sum of gold each time you spend a Great Person = Donne de l'Or à chaque fois qu'un Personnage Illustre est consommé [stats] whenever a Great Person is expended = [stats] pour chaque Personnage Illustre consommé Receive free [unit] when you discover [tech] = Reçoit un(e) [unit] gratuit(e) en découvrant [tech] diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index faecb4befc..73ca17adec 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -1411,8 +1411,7 @@ What would you like to do with the city of [cityName]? = Was möchtet Ihr mit de Annex = Annektieren Annexed cities become part of your regular empire. = Annektierte Städte werden Teil Eures Reichs Their citizens generate 2x the unhappiness, unless you build a courthouse. = Deren Bürger generieren 2x soviel Unzufriedenheit, solange bis Ihr ein Gerichtsgebäude gebaut habt. - # Requires translation! -Your civilization may not annex this city. = +Your civilization may not annex this city. = Deine Zivilisation darf diese Stadt nicht annektieren. Puppet = Marionette Puppeted cities do not increase your tech or policy cost. = Marionettenstädte erhöhen weder die Kosten für Technologie noch für Sozialpolitik. You have no control over the the production of puppeted cities. = Ihr habt keine Kontrolle über die Produktion von Marionettenstädten. @@ -1422,8 +1421,7 @@ Liberate (city returns to [originalOwner]) = Befreien (Stadt geht wieder in den Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Befreite Städte gehen wieder in den Besitz des vorherigen Besitzers über. Eure Beziehung wird sich dadurch massiv verbessern! Raze = Niederreißen Razing the city annexes it, and starts burning the city to the ground. = Niederreißen annektiert die Stadt zunächst und macht sie dem Erdboden gleich. - # Requires translation! -Razing the city puppets it, and starts burning the city to the ground. = +Razing the city puppets it, and starts burning the city to the ground. = Niederreißen der Stadt verwandelt sie zu einer Marionette und macht sie dem Erdboden gleich. The population will gradually dwindle until the city is destroyed. = Die Bevölkerung wird allmählich schrumpfen, bis die Stadt zerstört ist. Original capitals and holy cities cannot be razed. = Ursprüngliche Hauptstädte und heilige Städte können nicht abgerissen werden. Destroy = Zerstören @@ -1898,8 +1896,7 @@ Land units may cross [terrainName] tiles after the first [baseUnitFilter] is ear Gain [amount] Influence with a [baseUnitFilter] gift to a City-State = Erhalte [amount] Einfluss für ein [baseUnitFilter] Geschenk an einen Stadtstaat [relativeAmount]% Faith cost of generating Great Prophet equivalents = [relativeAmount]% Glaubenskosten für die Generierung eines Großen Propheten Resting point for Influence with City-States following this religion [amount] = [amount] Basispunkt für Einfluss auf Stadtstaaten, die dieser Religion folgen - # Requires translation! -May not annex cities = +May not annex cities = Darf keine Städte annektieren Provides a sum of gold each time you spend a Great Person = Gibt Dir jedes mal beim Einsatz einer Großen Persönlichkeit etwas Gold [stats] whenever a Great Person is expended = [stats] wenn eine Große Persönlichkeit genutzt wird. Receive free [unit] when you discover [tech] = Erhalte eine kostenlose Einheit "[unit]" bei der Entdeckung von [tech] diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index a2869e1431..d58397049c 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -1417,8 +1417,7 @@ What would you like to do with the city of [cityName]? = Cosa vorresti fare di [ Annex = Annetti Annexed cities become part of your regular empire. = Le città annesse faranno parte regolare del tuo impero. Their citizens generate 2x the unhappiness, unless you build a courthouse. = I loro cittadini genereranno il doppio dell'Infelicità, fino a quando non costruirai un Palazzo di giustizia. - # Requires translation! -Your civilization may not annex this city. = +Your civilization may not annex this city. = La tua civiltà non può annettere questa città. Puppet = Riduci a Stato Fantoccio Puppeted cities do not increase your tech or policy cost. = Gli stati fantoccio non apportano alcun incremento ai costi in Scienza e nelle politiche sociali. You have no control over the the production of puppeted cities. = Non hai alcun controllo sulla produzione delle città fantoccio. @@ -1428,8 +1427,7 @@ Liberate (city returns to [originalOwner]) = Libera (restituisci a [originalOwne Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Se liberi la città la restituirà al suo possessore originale, e tu avrai un'enorme bonus diplomatico nei suoi confronti! Raze = Radi al suolo Razing the city annexes it, and starts burning the city to the ground. = Questa opzione ti permetterà di annettere la città e poi di raderla al suolo. - # Requires translation! -Razing the city puppets it, and starts burning the city to the ground. = +Razing the city puppets it, and starts burning the city to the ground. = Rendi questa città uno stato fantoccio e poi inizi a raderla al suolo. The population will gradually dwindle until the city is destroyed. = La popolazione diminuirà gradualmente fino alla distruzione totale della città. Original capitals and holy cities cannot be razed. = Non puoi razziare le capitali originali e le città sante. Destroy = Distruggi @@ -1495,7 +1493,7 @@ Natural Wonder [naturalWonder] does not exist in ruleset! = La Meraviglia Natura # Civilopedia difficulty levels Player settings = Impostazioni giocatore -Extra happiness per luxury = Felicità extra per lussuria +Extra happiness per luxury = Felicità extra dalle risorse di lusso Research cost modifier = Modificatore costi ricerca Unit cost modifier = Modificatore costi unità Building cost modifier = Modificatore costi edifici @@ -1905,8 +1903,7 @@ Land units may cross [terrainName] tiles after the first [baseUnitFilter] is ear Gain [amount] Influence with a [baseUnitFilter] gift to a City-State = Ottieni [amount] Influenza con un dono [baseUnitFilter] a una Città-Stato [relativeAmount]% Faith cost of generating Great Prophet equivalents = [relativeAmount]% costi in Fede nel generare Grandi Profeti equivalenti Resting point for Influence with City-States following this religion [amount] = [amount] punteggio Influenza default con le Città-Stato che segue questa religione - # Requires translation! -May not annex cities = +May not annex cities = Non può annettere città Provides a sum of gold each time you spend a Great Person = Concede una tantum di Oro ogni volta che sacrifichi un Grande Personaggio [stats] whenever a Great Person is expended = [stats] quando sacrifichi un Grande Personaggio Receive free [unit] when you discover [tech] = Ricevi un [unit] gratuito quando scopri [tech] diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 929409f547..ca6243efab 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -1415,7 +1415,7 @@ Annex = Przyłącz (aneksja) Annexed cities become part of your regular empire. = Przyłączone miasta stają się częścią twego imperium. Their citizens generate 2x the unhappiness, unless you build a courthouse. = Ich obywatele generują podwójne niezadowolenie, chyba że wybudujesz Sąd. # Requires translation! -Your civilization may not annex this city. = +Your civilization may not annex this city. = Twoja cywilizacja nie może zaanektować tego miasta. Puppet = Uczyń Marionetką Puppeted cities do not increase your tech or policy cost. = Miasta marionetkowe nie zwiększają kosztów technologii ani kosztów ustrojów społecznych. You have no control over the the production of puppeted cities. = Nie masz kontroli nad produkcją w marionetkowych miastach. @@ -1426,7 +1426,7 @@ Liberating a city returns it to its original owner, giving you a massive relatio Raze = Wyburz Razing the city annexes it, and starts burning the city to the ground. = Spowoduje to zajęcie miasta i jego powolne wyburzanie. # Requires translation! -Razing the city puppets it, and starts burning the city to the ground. = +Razing the city puppets it, and starts burning the city to the ground. = Wyburzanie miasta czyni je marionetką i jednocześnie zaczyna je niszczyć. The population will gradually dwindle until the city is destroyed. = Populacja miasta będzie stopniowo malała aż do zera. Original capitals and holy cities cannot be razed. = Stolice innych cywilizacji i Święte Miasta nie mogą zostać zniszczone. Destroy = Zniszcz @@ -1904,7 +1904,7 @@ Gain [amount] Influence with a [baseUnitFilter] gift to a City-State = [baseUnit [relativeAmount]% Faith cost of generating Great Prophet equivalents = [relativeAmount]% mniej kosztów ☮Wiary przy generowaniu Wielkiego Proroka Resting point for Influence with City-States following this religion [amount] = Bazowy Punkt Wpływów na Wolne Miasta wyznające tę religię [amount] # Requires translation! -May not annex cities = +May not annex cities = Nie można zaanektować miast Provides a sum of gold each time you spend a Great Person = Zawsze gdy Wielki Człowiek zakończy swoją misję otrzymasz pewną sumę Złota¤ [stats] whenever a Great Person is expended = Zawsze gdy Wielki Człowiek zakończy swoją misję otrzymasz [stats] Receive free [unit] when you discover [tech] = Po odkryciu technologii [tech] otrzymuje darmową jednostkę [unit] diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index d48eeae077..cb98ac117e 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.0" const val appName = "Unciv" - const val appCodeNumber = 866 - const val appVersion = "4.6.11-patch1" + const val appCodeNumber = 867 + const val appVersion = "4.6.12" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 5d0d94432d..1b30c68007 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,19 @@ +## 4.6.12 + +Display map ruleset when picking map, don't show unloadable maps + +Allow mods to contain a "preview.png" file for visual indication + +Multi-server preparations: Save server info in game, save server functionality in specific class + +4.6.11-patch1 + +Convert 'camps' vectorhashmap to 'encampments' arraylist + +By SomeTroglodyte: +- Animate battle damage numbers +- Combat java.util.star-import + ## 4.6.11 Update UI after founding city when breaking promise diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 08f495fa68..c6e9144474 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -532,7 +532,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.6.11-patch1", 866) + val VERSION = Version("4.6.12", 867) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/867.txt b/fastlane/metadata/android/en-US/changelogs/867.txt new file mode 100644 index 0000000000..a82ce67d3a --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/867.txt @@ -0,0 +1,15 @@ + + +Display map ruleset when picking map, don't show unloadable maps + +Allow mods to contain a "preview.png" file for visual indication + +Multi-server preparations: Save server info in game, save server functionality in specific class + +4.6.11-patch1 + +Convert 'camps' vectorhashmap to 'encampments' arraylist + +By SomeTroglodyte: +- Animate battle damage numbers +- Combat java.util.star-import \ No newline at end of file