From 42778b6d1cf0df94f0f7f25bd44583606b9cadd5 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 11 Mar 2023 20:29:00 +0200 Subject: [PATCH] Version rollout (#8867) * Bump version and create initial changelog entry * Update Belarusian.properties (#8858) * Update Hungarian.properties (#8855) * Update Hungarian.properties * Update Hungarian.properties * Update Hungarian.properties * Update Hungarian.properties * Update German translation (#8853) * Update German translation * Update German translation * Updated Brazilian_Portuguese.properties (#8852) * Update Polish.properties (#8851) * Update Italian.properties (#8849) * Update Ukrainian.properties (#8848) * Update Ukrainian.properties * Update Ukrainian.properties * Update french translations. (#8847) * Complete missing translation. * Update French.properties --------- Co-authored-by: yairm210 Co-authored-by: MonoDx <87523240+monodevx@users.noreply.github.com> Co-authored-by: balazsszalab Co-authored-by: mape6 Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: Gualdimar Co-authored-by: HydrolienF <71718798+HydrolienF@users.noreply.github.com> --- .../jsons/translations/Belarusian.properties | 48 +++++++------------ .../Brazilian_Portuguese.properties | 12 ++--- .../jsons/translations/French.properties | 12 ++--- .../jsons/translations/German.properties | 39 +++++---------- .../jsons/translations/Hungarian.properties | 25 ++++------ .../jsons/translations/Italian.properties | 12 ++--- .../jsons/translations/Polish.properties | 8 ++-- .../jsons/translations/Ukrainian.properties | 6 +-- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 28 +++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/829.txt | 27 +++++++++++ 12 files changed, 115 insertions(+), 108 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/829.txt diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index 747cdb3ffb..cfa7bbdbd2 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -132,39 +132,23 @@ Farewell. = Да пабачэння. Sounds good! = Гучыць добра! Not this time. = Не ў гэты раз. Excellent! = Выдатна! - # Requires translation! -How about something else... = - # Requires translation! -A pleasure to meet you. = - # Requires translation! -Our relationship = - # Requires translation! -We have encountered the City-State of [name]! = - # Requires translation! -Declare Friendship ([numberOfTurns] turns) = - # Requires translation! -May our nations forever remain united! = - # Requires translation! -Indeed! = - # Requires translation! -Denounce [civName]? = - # Requires translation! -Denounce ([numberOfTurns] turns) = - # Requires translation! -We will remember this. = +How about something else... = Як на конт чагосці іншага... +A pleasure to meet you. = Прыемна пазнаёміцца. +Our relationship = Вашыя адносіны +We have encountered the City-State of [name]! = Вы сустрэлі Горад-Дзяржаву [name]! +Declare Friendship ([numberOfTurns] turns) = Падпісаць Сяброўскае Ўзгадненне ([numberOfTurns] хадоў) +May our nations forever remain united! = Можа другія нацыі заўсёды чакаюць абядгання! +Indeed! = Сапраўды! +Denounce [civName]? = Асудзіць [civName]? +Denounce ([numberOfTurns] turns) = Азудзіць праз ([numberOfTurns] хадоў) +We will remember this. = Мы гэта запмонім. - # Requires translation! -[civName] has declared war on [targetCivName]! = - # Requires translation! -[civName] and [targetCivName] have signed a Peace Treaty! = - # Requires translation! -[civName] and [targetCivName] have signed the Declaration of Friendship! = - # Requires translation! -[civName] has denounced [targetCivName]! = - # Requires translation! -Do you want to break your promise to [leaderName]? = - # Requires translation! -Break promise = +[civName] has declared war on [targetCivName]! = [civName] аб'явіла вайну [targetCivName]! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] і [targetCivName] падпісалі мірны дагавор! +[civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] і [targetCivName] падпісалі Сяброўскае Ўзгадненне! +[civName] has denounced [targetCivName]! = [civName] асудзіла [targetCivName]! +Do you want to break your promise to [leaderName]? = Ці жадаеце вы парушыць сваё абяцанне да [leaderName]? +Break promise = Парушыць абяцанне # Requires translation! We promised not to settle near them ([count] turns remaining) = # Requires translation! diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 94dd266321..262ff5b147 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1378,12 +1378,9 @@ Can be created instantly by = Pode ser criado instantâneamente por Defence bonus = Bônus de defesa Movement cost = Custo de movimento for = por - # Requires translation! -Landscape (fixed) = - # Requires translation! -Portrait (fixed) = - # Requires translation! -Auto (sensor adjusted) = +Landscape (fixed) = Paisagem (fixo) +Portrait (fixed) = Retrato (fixo) +Auto (sensor adjusted) = Automático (sensor ajustado) Missing translations: = Traduções faltando: Screen Size = Tamanho da Tela Screen Mode = Modo de tela @@ -1977,8 +1974,7 @@ by consuming this unit = Por consumir esta unidade for [amount] movement = para [amount] movimento once = uma vez [amount] times = [amount] vezes - # Requires translation! -[amount] additional time(s) = +[amount] additional time(s) = [amount] de tempo(s) adicional(is) after which this unit is consumed = após o qual esta unidade é consumida Grants 500 Gold to the first civilization to discover it = Concede 500 de Ouro para a primeira civilização que a descubra Units ending their turn on this terrain take [amount] damage = Unidades que terminam seu turno neste terreno recebem [amount] de dano diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 456bb3a74e..2855bbf2f6 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1378,12 +1378,9 @@ Can be created instantly by = Peut être créé instantanément par Defence bonus = Bonus de défense Movement cost = Coût de mouvement for = pour - # Requires translation! -Landscape (fixed) = - # Requires translation! -Portrait (fixed) = - # Requires translation! -Auto (sensor adjusted) = +Landscape (fixed) = Paysage (fixe) +Portrait (fixed) = Portrait (fixe) +Auto (sensor adjusted) = Auto (capteurs) Missing translations: = Traductions manquantes : Screen Size = Taille d'écran Screen Mode = Mode d'affichage @@ -1977,8 +1974,7 @@ by consuming this unit = en consommant cette unité for [amount] movement = pour [amount] mouvement(s) once = une fois [amount] times = [amount] fois - # Requires translation! -[amount] additional time(s) = +[amount] additional time(s) = [amount] fois de plus after which this unit is consumed = après quoi cette unité est consommée Grants 500 Gold to the first civilization to discover it = Accorde 500 Or à la première civilisation qui le découvre Units ending their turn on this terrain take [amount] damage = Les unités terminant leur tour sur ce terrain subissent [amount] dégâts diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 55f68a6dd5..3ded1290a0 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -1379,20 +1379,15 @@ Can be created instantly by = Kann sofort erschaffen werden von Defence bonus = Verteidigungsbonus Movement cost = Bewegungskosten for = für - # Requires translation! -Landscape (fixed) = - # Requires translation! -Portrait (fixed) = - # Requires translation! -Auto (sensor adjusted) = +Landscape (fixed) = Quer (fixiert) +Portrait (fixed) = Hochkant (fixiert) +Auto (sensor adjusted) = Auto (durch Sensor justiert) Missing translations: = Fehlende Übersetzungen: Screen Size = Bildschirmgröße - # Requires translation! -Screen Mode = +Screen Mode = Bildschirmmodus Windowed = Fenster Fullscreen = Vollbild - # Requires translation! -Borderless = +Borderless = Randlos Tileset = Feldgrafik-Satz Unitset = Einheitengrafik-Satz UI Skin = Aussehen der Benutzeroberfläche @@ -1478,10 +1473,8 @@ Units: = Einheiten: Unit types = Einheitentypen Domain: [param] = Domäne: [param] Toggle UI (World Screen only) = Oberfläche umschalten (Nur die Weltansicht) - # Requires translation! -Overrides yields from underlying terrain = - # Requires translation! -No yields = +Overrides yields from underlying terrain = Überschreibt die Erträge des darunter liegenden Geländes +No yields = Keine Erträge # Policies @@ -1979,16 +1972,11 @@ Spaceship part = Raumschiffteil Takes your religion over the one in their birth city = Übernimmt deine Religion anstelle der seiner Geburtsstadt Great Person - [comment] = Große Persönlichkeit - [comment] by consuming this unit = durch Verbrauch dieser Einheit - # Requires translation! -for [amount] movement = - # Requires translation! -once = - # Requires translation! -[amount] times = - # Requires translation! -[amount] additional time(s) = - # Requires translation! -after which this unit is consumed = +for [amount] movement = für [amount] Bewegung(en) +once = einmalig +[amount] times = [amount] Mal +[amount] additional time(s) = zusätzliche [amount] Mal +after which this unit is consumed = nach der diese Einheit verbraucht wird Grants 500 Gold to the first civilization to discover it = Gewährt 500 Gold für die erste Zivilisation, die es entdeckt Units ending their turn on this terrain take [amount] damage = Einheiten, die ihre Runde in diesem Gebiet beenden, erhalten [amount] Schaden Grants [promotion] ([comment]) to adjacent [mapUnitFilter] units for the rest of the game = Gestattet [promotion] ([comment]) benachbarten [mapUnitFilter] Einheiten für den Rest des Spiels @@ -2086,8 +2074,7 @@ Free [baseUnitFilter] found in the ruins = Kostenlose [baseUnitFilter] Einheiz i Free Social Policy = Kostenlose Sozialpolitik [amount] Free Social Policies = [amount] kostenlose Sozialpolitiken Empire enters golden age = Es beginnt ein Goldenes Zeitalter - # Requires translation! -Empire enters a [amount]-turn Golden Age = +Empire enters a [amount]-turn Golden Age = Es beginnt ein [amount]-Runden langes Goldenes Zeitalter Free Great Person = Kostenlose Große Persönlichkeit [amount] population [cityFilter] = [amount] Bevölkerung [cityFilter] [amount] population in a random city = [amount] Bevölkerung in einer zufälligen Stadt diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index e32067fc58..6b7685e661 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -729,8 +729,7 @@ Enable display cutout (requires restart) = Alkalmazokodás a kijelzőbemetszésh Show tile yields = Mező termelésének mutatása Show unit movement arrows = Egységmozgások mutatása nyilakkal Continuous rendering = Folyamatos renderelés - # Requires translation! -Experimental rendering improvements = +Experimental rendering improvements = Renderelés javítása (kísérleti) When disabled, saves battery life but certain animations will be suspended = Letiltásakor az akkumulátor üzemideje hosszab lesz, de bizonyos animációk nem lesznek láthatók Order trade offers by amount = Kereskedelmi ajánlatok mennyiség szerinti rendezése Ask for confirmation when pressing next turn = A következő körre nyomás után megerősítés szükséges @@ -774,7 +773,7 @@ We have encountered [civName]! = Találkoztunk [civName] nemzetével! [cityStateName] has also given us [stats] = [cityStateName] további ajándéka számunkra [stats] [cityStateName] gave us a [unitName] as a gift! = [cityStateName] egy [unitName] egységet ajándékozott nekünk! Cannot provide unit upkeep for [unitName] - unit has been disbanded! = [unitName] fenntartása nem lehetséges - egység elbocsátva! -[cityName] has grown! = [cityName] terjeszkedett! +[cityName] has grown! = [cityName] lakossága gyarapodott! [cityName] is starving! = [cityName] éhezik! [construction] has been built in [cityName] = [construction] elkészült [cityName] városában [wonder] has been built in a faraway land = [wonder] épült egy távoli földön @@ -1410,8 +1409,7 @@ Screen Size = Képernyőméret Screen Mode = Megjelenítési mód Windowed = Ablakban Fullscreen = Teljes képernyőn - # Requires translation! -Borderless = +Borderless = Ablakszegély nélkül Tileset = Mezők grafikája Unitset = Egységek grafikája UI Skin = Testreszabott felhasználói felület @@ -2470,7 +2468,7 @@ Granary = Magtár Temple of Artemis = Artemisz temploma # Requires translation! -'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson = +'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson = 'Nem is annyira a szépsége az, amivel megnyeri az ember szívét az erdő, mint inkább az az apró kis valami, a levegő milyensége, az öreg fák lehelete, amely oly csodálatosan átváltoztatja és felfrissíti a fáradt szellemet.' - Robert Lous Stevenson The Great Lighthouse = Alexandriai világítótorony 'They that go down to the sea in ships, that do business in great waters; these see the works of the Lord, and his wonders in the deep.' - The Bible, Psalms 107:23-24 = 'A kik hajókon tengerre szállnak, és a nagy vizeken kalmárkodnak, Azok látták az Úrnak dolgait, és az ő csodáit a mélységben.' - A Biblia, Zsoltárok 107:23-24 @@ -2985,8 +2983,7 @@ You are but a pest on this Earth, prepare to be eliminated! = You are a fool who evokes pity. You have brought my hostility upon yourself and your repulsive civilization! = # Requires translation! Strike me down and my soul will torment yours forever, you have won nothing. = - # Requires translation! -Greetings, I am Ramesses the god. I am the living embodiment of Egypt, mother and father of all civilizations. = +Greetings, I am Ramesses the god. I am the living embodiment of Egypt, mother and father of all civilizations. = Üdvözöllek, Ramszesz istenség vagyok. Én vagyok Egyiptom megtestülése, az összes civilizáció anyja és atyja! # Requires translation! Generous Egypt makes you this offer. = # Requires translation! @@ -3364,8 +3361,7 @@ Your wanton aggression leaves us no choice. Prepare for war! = You have mistaken our love of peace for weakness. You shall regret this! = # Requires translation! The day...is yours. I hope you will be merciful in your triumph. = - # Requires translation! -The people of the United States of America welcome you. = +The people of the United States of America welcome you. = Az Amerikai Egysült Államok lakosai üdvözölnek titeket! # Requires translation! Is the following trade of interest to you? = Well? = Hát? @@ -6634,10 +6630,8 @@ Shame that it has come this far. But ye wished it so. Next time, be so good, cho What a fool ye are! Ye will end swiftly and miserably. = # Requires translation! The world is pitiful! There's no beauty in it, no wisdom. I am almost glad to go. = - # Requires translation! -The archduchess of Austria welcomes your Eminence to... Oh let's get this over with! I have a luncheon at four o'clock. = - # Requires translation! -I see you admire my new damask. Nobody should say that I am an unjust woman. Let's reach an agreement! = +The archduchess of Austria welcomes your Eminence to... Oh let's get this over with! I have a luncheon at four o'clock. = Ausztria főhercegnője üdvözletét küldi Eminenciádnak, hogy... Jaj, essünk már túl rajta, mert ebédmeghívásom van négy órára! +I see you admire my new damask. Nobody should say that I am an unjust woman. Let's reach an agreement! = Ugye, milyen csodás ez az új damaszt? Ne mondja rám senki, hogy igazságtalan vagyok! Állapodjunk hát meg egymással! # Requires translation! Oh, it's ye! = Diplomatic Marriage = Diplomáciai házasság @@ -7283,8 +7277,7 @@ an ancient prophecy = ősi jövendölés #################### Lines from Techs from Civ V - Gods & Kings #################### - # Requires translation! -'What is drama but life with the dull bits cut out.' - Alfred Hitchcock = +'What is drama but life with the dull bits cut out.' - Alfred Hitchcock = 'A dráma olyan, mint az élet, csak az unalmas részek ki vannak vágva.' - Alfred Hitchcock Drama and Poetry = Dráma és Költészet # Requires translation! diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 6e84a72a87..e34ea8b9fb 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -1384,12 +1384,9 @@ Can be created instantly by = Creabile all'istante da Defence bonus = Bonus di Difesa Movement cost = Costi di movimento for = per - # Requires translation! -Landscape (fixed) = - # Requires translation! -Portrait (fixed) = - # Requires translation! -Auto (sensor adjusted) = +Landscape (fixed) = Panorama (fisso) +Portrait (fixed) = Ritratto (fisso) +Auto (sensor adjusted) = Automatico (sensori sistemati) Missing translations: = Traduzioni mancanti: Screen Size = Dimensioni schermo Screen Mode = Modalità schermata @@ -1984,8 +1981,7 @@ by consuming this unit = consumando questa unità for [amount] movement = per [amount] movimento once = una volta [amount] times = [amount] volte - # Requires translation! -[amount] additional time(s) = +[amount] additional time(s) = [amount] volte in più after which this unit is consumed = dopo la quale l'unità viene consumata Grants 500 Gold to the first civilization to discover it = Fornisce 500 Oro al primo giocatore che la scopre Units ending their turn on this terrain take [amount] damage = Le unità che terminano il loro turno su questo terreno subiscono [amount] danno diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 599c11e481..d37971d3b7 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -1382,11 +1382,11 @@ Defence bonus = Premia do obrony Movement cost = Koszt ruchu for = dla # Requires translation! -Landscape (fixed) = +Landscape (fixed) = Pionowo (zablokowane) # Requires translation! -Portrait (fixed) = +Portrait (fixed) = Poziomo (zablokowane) # Requires translation! -Auto (sensor adjusted) = +Auto (sensor adjusted) = Autoobracanie Missing translations: = Brakujące tłumaczenia: Screen Size = Rozdzielczość ekranu Screen Mode = Tryb ekranu @@ -1983,7 +1983,7 @@ for [amount] movement = na [amount] ruchy once = jeden raz [amount] times = [amount] razy # Requires translation! -[amount] additional time(s) = +[amount] additional time(s) = dodatkowych [amount] razy # Requires translation! after which this unit is consumed = Grants 500 Gold to the first civilization to discover it = +500¤ Złota dla pierwszej cywilizacji, która dokona odkrycia! diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 6678a8a39a..2f65aac22b 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -1295,8 +1295,8 @@ Destroy [civName] = Знищити націю [civName] Capture [cityName] = Захопити місто [cityName] Our status = Наш статус Global status = Глобальний статус -Rankings = Рейтинги -Demographics = Демографія +Rankings = Рейтинг +Demographics = Демографічний рейтинг Demographic = Демографічний Rank = Місце Value = Значення @@ -1975,7 +1975,7 @@ for [amount] movement = за [amount] ➡Переміщення once = один раз [amount] times = [amount] рази # Requires translation! -[amount] additional time(s) = +[amount] additional time(s) = ще [amount] раз(и) after which this unit is consumed = після чого цей підрозділ знищується Grants 500 Gold to the first civilization to discover it = Дарує 500 ¤Золота першій цивілізації яка відкрила його Units ending their turn on this terrain take [amount] damage = Підрозділи, що закінчують свій хід на цій місцевості, отримують [amount] пошкоджень diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 322b11d055..0f629ddb06 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 = 828 - const val appVersion = "4.5.5" + const val appCodeNumber = 829 + const val appVersion = "4.5.6" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 4eb9e586ac..aeee9cba7a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,31 @@ +## 4.5.6 + +"build and deploy" only activates on tag + +Everyone needs build + +AUR *also* needs build, for the tag and release notes + +AUR dependant on Github release upload + +AUR dependant on Github version upload + +Even if aab not uploaded, keep going and uploda the APK + +Cleaned up task 'on release' restrictions to be on job level + +By SomeTroglodyte: +- Debug option to paint coords on map tiles +- Custom key bindings +- Fix possible crash involving right-click attack +- Improve completeness and consistency of Technology descriptions +- Comments only - TileInfo to Tile +- Fix city desert tiles with Petra selectable + +AbsoluteUnits - Great Prophet, Settler (Industrial Era) - By letstalkaboutdune + +Extended CI with various extra tests, added Java 17 support in unit tests (fixes ) - By CrsiX + ## 4.5.5 Dynamic minimap - By Gualdimar diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 98dedef15a..2a97bdba95 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -529,7 +529,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.5.5", 828) + val VERSION = Version("4.5.6", 829) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/829.txt b/fastlane/metadata/android/en-US/changelogs/829.txt new file mode 100644 index 0000000000..455c838a32 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/829.txt @@ -0,0 +1,27 @@ + + +"build and deploy" only activates on tag + +Everyone needs build + +AUR *also* needs build, for the tag and release notes + +AUR dependant on Github release upload + +AUR dependant on Github version upload + +Even if aab not uploaded, keep going and uploda the APK + +Cleaned up task 'on release' restrictions to be on job level + +By SomeTroglodyte: +- Debug option to paint coords on map tiles +- Custom key bindings +- Fix possible crash involving right-click attack +- Improve completeness and consistency of Technology descriptions +- Comments only - TileInfo to Tile +- Fix city desert tiles with Petra selectable + +AbsoluteUnits - Great Prophet, Settler (Industrial Era) - By letstalkaboutdune + +Extended CI with various extra tests, added Java 17 support in unit tests (fixes ) - By CrsiX \ No newline at end of file