From c2b0293c1979972c61b741a23376b7ec529d92f3 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 11 Aug 2025 22:59:23 +0300 Subject: [PATCH] Version rollout (#13798) * Bump version and create initial changelog entry * Update French.properties (#13793) * Update Indonesian.properties (#13787) * Update Brazilian_Portuguese.properties (#13784) * Update Italian.properties (#13783) --------- Co-authored-by: yairm210 Co-authored-by: Ouaz Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com> Co-authored-by: Vitor Gabriel Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 9 ++--- .../jsons/translations/French.properties | 8 ++-- .../jsons/translations/Indonesian.properties | 24 ++++++------ .../jsons/translations/Italian.properties | 9 ++--- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 38 +++++++++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../android/en-US/changelogs/1154.txt | 37 ++++++++++++++++++ 8 files changed, 100 insertions(+), 31 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/1154.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 05edbc7c14..d6c88b6ccd 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2536,12 +2536,9 @@ upon discovering [techFilter] technology = ao descobrir a tecnologia [techFilter upon entering the [era] = ao entrar na [era] upon entering a new era = ao entrar em uma nova era upon adopting [policy/belief] = ao adotar [policy/belief] - # Requires translation! -upon declaring war on [civFilter] Civilizations = - # Requires translation! -upon being declared war on by [civFilter] Civilizations = - # Requires translation! -upon entering a war with [civFilter] Civilizations = +upon declaring war on [civFilter] Civilizations = ao declarar guerra às civilizações [civFilter] +upon being declared war on by [civFilter] Civilizations = ao ser declarada guerra por civilizações [civFilter] +upon entering a war with [civFilter] Civilizations = ao entrar em guerra com civilizações [civFilter] upon declaring friendship = ao declarar amizade upon declaring a defensive pact = ao declarar um pacto defensivo upon entering a Golden Age = ao entrar em uma Era de Ouro diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 930b8aa487..42ec545204 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -790,7 +790,7 @@ Windowed = Fenêtré Fullscreen = Plein écran Borderless = Sans bordure -UI Scale = Échelle de l'interface +UI Scale = Taille de l'interface ### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = Défilement auto. de la carte avec la souris @@ -2537,11 +2537,11 @@ upon entering the [era] = en entrant dans [era] upon entering a new era = en entrant dans une nouvelle ère upon adopting [policy/belief] = en adoptant [policy/belief] # Requires translation! -upon declaring war on [civFilter] Civilizations = +upon declaring war on [civFilter] Civilizations = en déclarant la guerre à des civilisations [civFilter] # Requires translation! -upon being declared war on by [civFilter] Civilizations = +upon being declared war on by [civFilter] Civilizations = en s'étant fait déclarer la guerre par des civilisations [civFilter] # Requires translation! -upon entering a war with [civFilter] Civilizations = +upon entering a war with [civFilter] Civilizations = en participant à une guerre avec des civilisations [civFilter] upon declaring friendship = en signant une déclaration d'amitié upon declaring a defensive pact = en signant un pacte de défense upon entering a Golden Age = en entrant dans un Âge d'Or diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 06055dcc74..c3ec65ea5b 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -141,7 +141,7 @@ War = Perang Peace = Perdamaian Research Agreement = Persetujuan Riset Declare war = Nyatakan perang -Declare war on [civName]? = Nyatakan perang pada [civName]? +Declare war on [civName]? = Nyatakan perang terhadap [civName]? [civName] will also join them in the war = [civName] juga akan bergabung dengan mereka dalam perang ini This will cancel your defensive pact with [civName] = Ini akan membatalkan pakta pertahanan dengan [civName] Go to on map = Pergi ke sana di peta @@ -167,7 +167,7 @@ Denounce [civName]? = Hina [civName]? Denounce ([numberOfTurns] turns) = Hina ([numberOfTurns] giliran) We will remember this. = Kami akan mengingat ini. -[civName] has declared war on [targetCivName]! = [civName] telah menyatakan perang kepada [targetCivName]! +[civName] has declared war on [targetCivName]! = [civName] telah menyatakan perang terhadap [targetCivName]! # Join War [civName] has joined [allyCivName] in the war against us! = [civName] telah bergabung dengan [allyCivName] dalam perang melawan kita! We have joined [allyCivName] in the war against [enemyCivName]! = Kita telah bergabung dengan [allyCivName] dalam perang melawan [enemyCivName]! @@ -270,7 +270,7 @@ Type = Jenis Friendly = Bersahabat Hostile = Bermusuhan Irrational = Irasional -Personality = Sifat +Personality = Kepribadian Influence = Pengaruh Ally: [civilization] with [amount] Influence = Sekutu: [civilization] dengan [amount] Pengaruh @@ -331,7 +331,7 @@ Declarations of war = Pernyataan perang Peace Proposals = Usulan Perdamaian Accept Embassy = Terima Kedutaan Introduction to [nation] = Perkenalan kepada [nation] -Declare war on [nation] = Nyatakan perang pada [nation] +Declare war on [nation] = Nyatakan perang terhadap [nation] Make peace with [nation] = Berdamai dengan [nation] Luxury resources = Sumber daya mewah Strategic resources = Sumber daya strategis @@ -1956,7 +1956,7 @@ Graphics = Grafis Audio = Suara Maps = Peta Fun = Kesenangan -Mods of mods = Mod untuk mod +Mods of mods = Mod dari mod Mod info and options = Info dan opsi mod Next page = Halaman selanjutnya Open Github page = Buka laman Github @@ -2131,7 +2131,7 @@ Each city founded increases Science cost of Technologies [relativeAmount]% less [stats] for discovering a Natural Wonder (bonus enhanced to [stats2] if first to discover it) = [stats] karena sudah menemukan Keajaiban Alam (bonus ditambahkan ke [stats2] jika menjadi penemu pertama) [relativeAmount]% Great Person generation [cityFilter] = [relativeAmount]% pemunculan Orang Hebat [cityFilter] [relativeAmount]% Gold from Great Merchant trade missions = [relativeAmount]% Emas dari misi dagang Pedagang Hebat -Great General provides double combat bonus = Jenderal Hebat memberikan bonus tempur dua kali lipat +Great General provides double combat bonus = Jenderal Besar memberikan bonus tempur dua kali lipat Receive a free Great Person at the end of every [comment] (every 394 years), after researching [tech]. Each bonus person can only be chosen once. = Mendapatkan Orang Hebat gratis pada akhir setiap [comment] (setiap 394 tahun), setelah meneliti [tech]. Setiap orang bonus hanya dapat dipilih sekali. Once The Long Count activates, the year on the world screen displays as the traditional Mayan Long Count. = Saat Perhitungan Panjang diaktifkan, tahun pada layar dunia ditampilkan dengan format Perhitungan Panjang tradisional Maya. [amount] Unit Supply = [amount] Pasokan Unit @@ -2312,7 +2312,7 @@ Destroys tile improvements when attacking = Menghancurkan peningkatan ubin saat Cannot move = Tidak dapat bergerak Double movement in [terrainFilter] = Pergerakan ganda di [terrainFilter] All tiles cost 1 movement = Semua ubin menghabiskan 1 pergerakan -May travel on Water tiles without embarking = Dapat melalui ubin Air tanpa perlu melaut +May travel on Water tiles without embarking = Dapat melalui ubin Air tanpa melaut Can pass through impassable tiles = Dapat bergerak melewati ubin yang tidak dapat dilewati Ignores terrain cost = Mengabaikan penghabisan medan Ignores Zone of Control = Mengabaikan Zona Kontrol @@ -2537,11 +2537,11 @@ upon entering the [era] = saat memasuki [era] upon entering a new era = saat memasuki era baru upon adopting [policy/belief] = saat menerapkan [policy/belief] # Requires translation! -upon declaring war on [civFilter] Civilizations = +upon declaring war on [civFilter] Civilizations = saat menyatakan perang terhadap Peradaban [civFilter] # Requires translation! -upon being declared war on by [civFilter] Civilizations = +upon being declared war on by [civFilter] Civilizations = saat dinyatakan perang oleh Peradaban [civFilter] # Requires translation! -upon entering a war with [civFilter] Civilizations = +upon entering a war with [civFilter] Civilizations = saat memasuki perang dengan Peradaban [civFilter] upon declaring friendship = saat menyatakan pertemanan upon declaring a defensive pact = saat menyatakan pakta pertahanan upon entering a Golden Age = saat memasuki Masa Kejayaan @@ -2845,7 +2845,7 @@ Dead = Mati #################### Lines from diplomatic modifiers ####################### -You declared war on us! = Kamu menyatakan perang pada kami! +You declared war on us! = Kamu menyatakan perang terhadap kami! Your warmongering ways are unacceptable to us. = Caramu berperang tidak dapat diterima oleh kami. You have captured our cities! = Kamu telah merebut kota kami! You have declared friendship with our enemies! = Kamu telah mendeklarasikan persahabatan dengan musuh kami! @@ -6281,7 +6281,7 @@ Ellac = Ellac Dengizik = Dengizik Hildico = Hildiko Gudrun = Gudrun -Attila's Court = Pengadilan Attila +Attila's Court = Istana Attila The Huns = Hun William of Orange = William Oranye diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 411dc270a7..bb5b1e714f 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2542,12 +2542,9 @@ upon discovering [techFilter] technology = quando scopri una tecnologia [techFil upon entering the [era] = quando entri nell'[era] upon entering a new era = quando entri in una nuova epoca upon adopting [policy/belief] = quando adotti [policy/belief] - # Requires translation! -upon declaring war on [civFilter] Civilizations = - # Requires translation! -upon being declared war on by [civFilter] Civilizations = - # Requires translation! -upon entering a war with [civFilter] Civilizations = +upon declaring war on [civFilter] Civilizations = quando dichiari guerra a [civFilter] Civiltà +upon being declared war on by [civFilter] Civilizations = quando [civFilter] Civiltà ti dichiarano guerra +upon entering a war with [civFilter] Civilizations = quando entri in guerra con [civFilter] Civiltà upon declaring friendship = quando fai una Dichiarazione d'Amicizia upon declaring a defensive pact = quando firmi un accordo di difesa upon entering a Golden Age = quando entri in un'Età dell'Oro diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 7a3601df18..b1be34ff35 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 = "2.1.20" const val appName = "Unciv" - const val appCodeNumber = 1153 - const val appVersion = "4.17.12" + const val appCodeNumber = 1154 + const val appVersion = "4.17.13" const val gdxVersion = "1.13.1" const val ktorVersion = "3.2.3" diff --git a/changelog.md b/changelog.md index e52fc34b57..269718203a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,41 @@ +## 4.17.13 + +chore(purity): IdChecker + +chore(purity): Translations + +chore(purity): CityStats 1 + +chore(purity): RoadBetweenCitiesAutomation + +chore(purity): MapPathing + +chore(purity): Removed suppressions + +chore(purity): Converted internal state classes to use annotations + +chore(purity): minor + +chore(purity): TradeEvaluation, TradeLogic + +chore(purity): Trade, TradeOffer + +chore(purity): Update version, remove most well-knowns, fix function invokes + +chore(purity): Update version, remove most well-knowns, fix function invokes + +chore(purity): CityConstructions + +chore(purity): Victory, ReligionManager + +chore(purity): Civilization + +chore(purity): QuestManager + +AI: build more workers - By EmperorPinguin + +Fix combat conditionals not working correctly - By SeventhM + ## 4.17.12 Fixed spy surveillance progressing tech stealing when no techs are available to steal diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 54ed350d45..d05b548ac6 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -494,7 +494,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.17.12", 1153) + val VERSION = Version("4.17.13", 1154) //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/1154.txt b/fastlane/metadata/android/en-US/changelogs/1154.txt new file mode 100644 index 0000000000..7306748a79 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1154.txt @@ -0,0 +1,37 @@ + + +chore(purity): IdChecker + +chore(purity): Translations + +chore(purity): CityStats 1 + +chore(purity): RoadBetweenCitiesAutomation + +chore(purity): MapPathing + +chore(purity): Removed suppressions + +chore(purity): Converted internal state classes to use annotations + +chore(purity): minor + +chore(purity): TradeEvaluation, TradeLogic + +chore(purity): Trade, TradeOffer + +chore(purity): Update version, remove most well-knowns, fix function invokes + +chore(purity): Update version, remove most well-knowns, fix function invokes + +chore(purity): CityConstructions + +chore(purity): Victory, ReligionManager + +chore(purity): Civilization + +chore(purity): QuestManager + +AI: build more workers - By EmperorPinguin + +Fix combat conditionals not working correctly - By SeventhM \ No newline at end of file