From 83f2c7825f3a2bb16a3d3f302fbb4e00f6a1aed4 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 9 Nov 2022 14:01:01 +0200 Subject: [PATCH] Version rollout (#7995) * Bump version and create initial changelog entry * Update Filipino.properties (#7993) * Update Filipino.properties * Update Filipino.properties * Update Filipino.properties * Update Filipino.properties * Update Filipino.properties * Update Filipino.properties * Update Filipino.properties * Update Filipino.properties * Update Filipino.properties * Update Filipino.properties Co-authored-by: yairm210 Co-authored-by: Shann Aurelle Ripalda --- .../jsons/translations/Filipino.properties | 15 +++++---------- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- changelog.md | 18 ++++++++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/762.txt | 17 +++++++++++++++++ 5 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/762.txt diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index 22046fd410..0bbe7b9526 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -641,8 +641,7 @@ Copy saved game to clipboard = Kopyahin ang tinabi na laro sa clipboard Could not load game! = Di kayang i-load ang laro! Could not load game from clipboard! = Di kayang i-load ang laro sa clipboard! Could not load game from custom location! = Hindi kayang mag-load mula sa piniling lokasyon! - # Requires translation! -The save was created with an incompatible version of Unciv: [version]. Please update Unciv to this version or later and try again. = +The save was created with an incompatible version of Unciv: [version]. Please update Unciv to this version or later and try again. = Itong tinabi na laro ay hindi tugma sa bersyon ng Unciv: [version]. Pakitaas ang bersyon ng Unciv sa bersyong ito at subukan itong muli. Load [saveFileName] = I-load ang [saveFileName] Are you sure you want to delete this save? = Sigurado ka ba na gusto mong tanggalin ang tinabing laro na ito? Delete save = Tanggalin ang tinabi @@ -2435,10 +2434,8 @@ How would you like it if I propose this kind of exchange? = Paano mo magugustuha Hello! = Hello! What do you need?! = Ano'ng kailangan mo?! Siberian Riches = Kayamanan ng Siberya - # Requires translation! -Greetings upon thee, Your Imperial Majesty Catherine, wondrous Empress of all the Russias. At your command lies the largest country in the world. Mighty Russia stretches from the Pacific Ocean in the east to the Baltic Sea in the west. Despite wars, droughts, and every manner of disaster the heroic Russian people survive and prosper, their artists and scientists among the best in the world. The Empire today remains one of the strongest ever seen in human history - a true superpower, with the greatest destructive force ever devised at her command. = - # Requires translation! -Catherine, your people look to you to bring forth glorious days for Russia and her people, to revitalize the land and recapture the wonder of the Enlightenment. Will you lead your people once more into greatness? Can you build a civilization that will stand the test of time? = +Greetings upon thee, Your Imperial Majesty Catherine, wondrous Empress of all the Russias. At your command lies the largest country in the world. Mighty Russia stretches from the Pacific Ocean in the east to the Baltic Sea in the west. Despite wars, droughts, and every manner of disaster the heroic Russian people survive and prosper, their artists and scientists among the best in the world. The Empire today remains one of the strongest ever seen in human history - a true superpower, with the greatest destructive force ever devised at her command. = Pagbati sa iyo, Iyong Imperyal na Kamhalan Catherine, kahanga-hangang Emperatris ng lahat ng Rusiya. Sa iyong utos nakasalalay ang pinakamalaking bansa sa mundo. Ang makapangyarihang Rusiya ay umaabot mula sa Karagatang Pasipiko sa silangan hanggang sa Dagat Baltiko sa kanluran. Sa kabila ng mga digmaan, tagtuyot, at lahat ng uri ng sakuna, ang mga bayaning Ruso ay nabubuhay at umunlad, ang kanilang mga artista at siyentipiko ay kabilang sa mga pinakamahusay sa mundo. Ang Imperyo ngayon ay nananatiling isa sa pinakamalakas na nakita sa kasaysayan ng tao - isang tunay na pinakamalakas sa buong mundo, na may pinakamalaking mapanirang puwersa na nilikha sa kanyang utos. +Catherine, your people look to you to bring forth glorious days for Russia and her people, to revitalize the land and recapture the wonder of the Enlightenment. Will you lead your people once more into greatness? Can you build a civilization that will stand the test of time? = Catherine, ang iyong mga tao ay umaasa sa iyo upang ilabas ang maluwalhating mga araw para sa Rusiya at sa kanyang mga tao, upang muling pasiglahin ang lupain at muling makuha ang kamangha-mangha ng Kaliwanagan. Aakayin mo pa ba ang iyong mga tao sa kadakilaan? Maaari ka bang bumuo ng isang sibilisasyon na tatayo sa pagsubok ng panahon? Moscow = Moscow St. Petersburg = St. Petersburg Novgorod = Novgorod @@ -2489,10 +2486,8 @@ I offer this, for your consideration. = Iniaalok ko ito, para sa iyong pagsasaal Hail. = Mabuhay. What do you want? = Anong gusto mo? The Glory of Rome = Ang Kaluwalhatian ng Roma - # Requires translation! -The blessings of the gods be upon you, Caesar Augustus, emperor of Rome and all her holdings. Your empire was the greatest and longest lived of all in Western civilization. And your people single-handedly shaped its culture, law, art, and warfare like none other, before or since. Through years of glorious conquest, Rome came to dominate all the lands of the Mediterranean from Spain in the west to Syria in the east. And her dominion would eventually expand to cover much of England and northern Germany. Roman art and architecture still awe and inspire the world. And she remains the envy of all lesser civilizations who have followed. = - # Requires translation! -O mighty emperor, your people turn to you to once more reclaim the glory of Rome! Will you see to it that your empire rises again, bringing peace and order to all? Will you make Rome once again center of the world? Can you build a civilization that will stand the test of time? = +The blessings of the gods be upon you, Caesar Augustus, emperor of Rome and all her holdings. Your empire was the greatest and longest lived of all in Western civilization. And your people single-handedly shaped its culture, law, art, and warfare like none other, before or since. Through years of glorious conquest, Rome came to dominate all the lands of the Mediterranean from Spain in the west to Syria in the east. And her dominion would eventually expand to cover much of England and northern Germany. Roman art and architecture still awe and inspire the world. And she remains the envy of all lesser civilizations who have followed. = Sumainyo nawa ang mga pagpapala ng mga diyos, Sesar Augustus, emperador ng Roma at lahat ng kanyang pag-aari. Ang iyong imperyo ang pinakadakila at pinakamatagal na nabuhay sa lahat sa Kanlurang Sibilisasyon. At ang iyong mga tao ay nag-iisang humubog sa kultura, batas, sining, at pakikidigma nito na walang katulad, noon o mula noon. Sa pamamagitan ng mga taon ng maluwalhating pananakop, ang Roma ay dumating upang mapangibabawan ang lahat ng mga lupain ng Mediteraneo mula sa Espanya sa kanluran hanggang sa Sirya sa silangan. At sa kalaunan ay lalawak ang kanyang kapangyarihan upang masakop ang karamihan sa Inglatera at hilagang Alemanya. Ang sining at arkitektura ng mga Romano ay humahanga at nagbibigay inspirasyon pa rin sa mundo. At nananatili siyang inggit ng lahat ng mas mababang sibilisasyon na sumunod. +O mighty emperor, your people turn to you to once more reclaim the glory of Rome! Will you see to it that your empire rises again, bringing peace and order to all? Will you make Rome once again center of the world? Can you build a civilization that will stand the test of time? = O makapangyarihang emperador, bumaling sa iyo ang iyong mga tao upang muling bawiin ang kaluwalhatian ng Roma! Sisiguraduhin mo ba na muling bumangon ang iyong imperyo, na nagdadala ng kapayapaan at kaayusan sa lahat? Gagawin mong sentro muli ng mundo ang Roma? Maaari ka bang bumuo ng isang sibilisasyon na tatayo sa pagsubok ng panahon? Rome = Roma Antium = Antium Cumae = Cumae diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 1070133800..b702995e52 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.7.0" const val appName = "Unciv" - const val appCodeNumber = 761 - const val appVersion = "4.2.17" + const val appCodeNumber = 762 + const val appVersion = "4.2.18" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 59bd8ac044..e1e87a84d3 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,21 @@ +## 4.2.18 + +Fixed mod promotions conflicting with existing promotion locations + +Fixed rare thread crashes + +Added before/after X turns conditionals - see + +Added before/after Pantheon conditionals - see + +Added "only available when" limitations to Ruins - see + +Deprecated old unique + +Resolved - Misspelling replacement text contains conditionals + +Resolved - Get entire repo data for manually downloaded mods + ## 4.2.17 Added layout option for promotions, added promotion layout for G&K diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 6e0e3577c4..43e5e52f53 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -472,7 +472,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.2.17", 761) + val VERSION = Version("4.2.18", 762) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/762.txt b/fastlane/metadata/android/en-US/changelogs/762.txt new file mode 100644 index 0000000000..adf37bd179 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/762.txt @@ -0,0 +1,17 @@ + + +Fixed mod promotions conflicting with existing promotion locations + +Fixed rare thread crashes + +Added before/after X turns conditionals - see + +Added before/after Pantheon conditionals - see + +Added "only available when" limitations to Ruins - see + +Deprecated old unique + +Resolved - Misspelling replacement text contains conditionals + +Resolved - Get entire repo data for manually downloaded mods \ No newline at end of file