From 903cabed27385b5066f74f5c6f34daa63133508b Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 14 May 2024 11:18:51 +0300 Subject: [PATCH] Version rollout (#11592) * Bump version and create initial changelog entry * Update Ukrainian translations (#11589) Co-authored-by: Kostiantyn Ko * Update French.properties (#11585) * Update Brazilian_Portuguese.properties (#11582) * Update Indonesian.properties (#11580) Added new translation and corrected the mistranslation. --------- Co-authored-by: yairm210 Co-authored-by: Kostiantyn Ko Co-authored-by: Kostiantyn Ko Co-authored-by: Ouaz Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 11 ++++--- .../jsons/translations/French.properties | 2 +- .../jsons/translations/Indonesian.properties | 10 +++---- .../jsons/translations/Ukrainian.properties | 29 +++++++++---------- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +-- changelog.md | 15 ++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/996.txt | 14 +++++++++ 8 files changed, 57 insertions(+), 30 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/996.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index a48f6b256b..91faa6bc4c 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1572,7 +1572,7 @@ Occurs on [listOfTerrains] = Ocorre em [listOfTerrains] Occurs on: = Ocorre em: Placed on [terrainType] = Colocado em [terrainType] Can be found on = Pode ser encontrado em -Improved by [improvement] = Melhorado por [improvement] +Improved by [improvement] = Aprimorado por [improvement] Bonus stats for improvement = Bônus de estatísticas por melhoria Buildings that consume this resource = Construções que consomem esse recurso Buildings that provide this resource = Edifícios que fornecem este recurso @@ -2115,7 +2115,7 @@ Must not be on [tileFilter] = Não deve estar em [tileFilter] Must not be next to [tileFilter] = Não deve estar ao lado de [tileFilter] Indicates the capital city = Indica a Capital Moves to new capital when capital changes = Muda para a nova capital quando a capital muda -Provides 1 extra copy of each improved luxury resource near this City = Fornece 1 cópia extra de cada recurso luxuoso melhorado próximo a cidade. +Provides 1 extra copy of each improved luxury resource near this City = Fornece 1 cópia extra de cada recurso luxuoso aprimorado próximo a cidade. Destroyed when the city is captured = Destruído quando a cidade é capturada Doubles Gold given to enemy if city is captured = Dobra o Ouro dado ao inimigo se a cidade for capturada Remove extra unhappiness from annexed cities = Remove infelicidade extra das cidades anexadas @@ -2545,8 +2545,8 @@ Bonus resource = Recurso de bônus ######### Tile Filters ########### -unimproved = não melhorado -improved = melhorado +unimproved = não aprimorado +improved = aprimorado All Road = Toda a estrada ######### Region Types ########### @@ -6865,8 +6865,7 @@ Right-click or long press multiple techs to append them to the research queue, w Overview screens = Tela de visão geral Reveal known resources on world screen = Revele recursos conhecidos na tela do mundo In the Resources overview, click on a resource icon to center the world screen on tiles already discovered and providing this resource. = Na visão geral dos Recursos, clique em um ícone de recurso para centralizar a tela do mundo nos paineis já descobertos e que fornecem esse recurso. - # Requires translation! -Alternatively, click on the "Unimproved" number to center the world screen only on owned (by you or your allied City-states) tiles where the resource is not improved. = +Alternatively, click on the "Unimproved" number to center the world screen only on owned (by you or your allied City-states) tiles where the resource is not improved. = Como alternativa, clique no número "Não aprimorado" para centralizar a tela do mundo apenas nos painéis de sua cidade (sua ou de suas cidades-estado aliadas) onde o recurso não foi aprimorado. If more than one tile is available, click repeatedly on the notification to cycle through all of them. = Se mais de um painel estiver disponível, clique repetidamente na notificação para percorrer todos eles. Show diagram line colors = Mostrar cores das linhas do diagrama In Politics overview > Show diagram, you can click anywhere inside the diagram to display a table listing all relationship line colors and their meaning. = Em Visão geral da política > Mostrar diagrama, você pode clicar em qualquer lugar dentro do diagrama para exibir uma tabela listando todas as cores das linhas de relacionamento e seus significados. diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 006026d913..4ec99985cc 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -6866,7 +6866,7 @@ Overview screens = Vues d'ensemble Reveal known resources on world screen = Révéler les ressources connues sur l'écran Carte In the Resources overview, click on a resource icon to center the world screen on tiles already discovered and providing this resource. = Dans la Vue d'ensemble des Ressources, cliquez sur une icône de ressource pour centrer la carte sur les cases déjà découvertes et fournissant cette ressource. # Requires translation! -Alternatively, click on the "Unimproved" number to center the world screen only on owned (by you or your allied City-states) tiles where the resource is not improved. = +Alternatively, click on the "Unimproved" number to center the world screen only on owned (by you or your allied City-states) tiles where the resource is not improved. = Il est également possible de cliquer sur la valeur "Non-Aménagées" pour centrer la carte uniquement sur les cases de votre empire (ou des Cités-États alliées) où la ressource n'est pas aménagée. If more than one tile is available, click repeatedly on the notification to cycle through all of them. = Si plus d'une case est disponible, cliquez plusieurs fois sur la notification afin de les parcourir en boucle. Show diagram line colors = Afficher la légende du diagramme des relations In Politics overview > Show diagram, you can click anywhere inside the diagram to display a table listing all relationship line colors and their meaning. = Dans la vue d'ensemble Politique > Afficher Diagramme, un clic à l'intérieur du diagramme affiche un tableau listant toutes les couleurs des lignes de relation et leur signification. diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 5ddb1027c8..2f058c2c34 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -1886,7 +1886,7 @@ Stars ￬ = Bintang ￬ Status ￬ = Status ￬ Scenarios = Skenario -Error loading scenario: = Eror saat memuat skenario: +Error loading scenario: = Terjadi kesalahan saat memuat skenario: Choose scenario = Pilih skenario # Uniques that are relevant to more than one type of game object @@ -2276,7 +2276,7 @@ Costs [amount] [stat] per turn = Memerlukan biaya [amount] [stat] per giliran Adjacent enemy units ending their turn take [amount] damage = Unit musuh bersebelahan yang mengakhiri giliran mereka mendapatkan [amount] kerusakan Great Improvement = Peningkatan Besar Provides a random bonus when entered = Memberikan bonus acak ketika dimasuki -Constructing it will take over the tiles around it and assign them to your closest city = Daerah yang berada di sekitar pembangunan ini akan dipakai dan diserahkan ke kota terdekat +Constructing it will take over the tiles around it and assign them to your closest city = Daerah yang berada di sekitar pembangunan ini akan dipakai dan diserahkan kepada kota terdekat Unpillagable = Tidak dapat dijarah Irremovable = Tidak dapat disingkirkan Will be replaced by automated workers = Akan digantikan oleh pekerja otomatis @@ -6325,7 +6325,7 @@ Greetings, wayward one. I am known as Pacal. = Salam, orang yang tidak patuh. Ak Friend, I believe I may have found a way to save us all! Look, look and accept my offering! = Teman, aku percaya aku mungkin telah memiliki sebuah jalan yang bisa menyelamatkan kita semua! Lihat, lihatlah dan terimalah tawaran saya! A fine day, it helps you. = Hari yang baik, yang membantu engkau. The Long Count = Perhitungan Panjang -Kneel before King Pacal the Great, son of the gods and protector of the Palenque domain! After your kingdom has been harassed for years by neighboring rivals, you struck back at the enemies of your people, defeating each of them and sacrificing their leaders as a retribution to the insults made to your ancestors. Your wisdom and hard will not only restored the glory of Palenque, but turned it into a magnificient city, as your people built the greatest monuments and architecture the world has ever known. = Tunduk kepada Raja Pakal yang Agung, putra para dewa dan pelindung wilayah Palenque! Setelah kerajaanmu diusik selama bertahun-tahun oleh saingan-saingan tetangga, engkau menyerang kembali musuh-musuh rakyatmu, mengalahkan masing-masing dari mereka dan mengorbankan pemimpin-pemimpin mereka sebagai hukuman setimpal untuk hinaan-hinaan yang dibuat kepada leluhurmu. Kebijaksaan dan tekad kerasmu tidak hanya kejayaan Palenque, tetapi mengubahnya menjadi sebuah kota yang luar biasa, setelah rakyatmu membangun monumen-monumen dan arsitektur terhebat yang pernah dunia ketahui. +Kneel before King Pacal the Great, son of the gods and protector of the Palenque domain! After your kingdom has been harassed for years by neighboring rivals, you struck back at the enemies of your people, defeating each of them and sacrificing their leaders as a retribution to the insults made to your ancestors. Your wisdom and hard will not only restored the glory of Palenque, but turned it into a magnificient city, as your people built the greatest monuments and architecture the world has ever known. = Tunduk kepada Raja Pakal yang Agung, putra para dewa dan pelindung wilayah Palenque! Setelah kerajaanmu diusik selama bertahun-tahun oleh saingan-saingan yang bersebelahan, engkau menyerang kembali musuh-musuh rakyatmu, mengalahkan masing-masing dari mereka dan mengorbankan pemimpin-pemimpin mereka sebagai hukuman setimpal untuk hinaan-hinaan yang dibuat kepada leluhurmu. Kebijaksaan dan tekad kerasmu tidak hanya kejayaan Palenque, tetapi mengubahnya menjadi sebuah kota yang luar biasa, setelah rakyatmu membangun monumen-monumen dan arsitektur terhebat yang pernah dunia ketahui. Absolute King, your people need you to save the great Mayan culture and knowledge. Will you be able to read the movement of the stars, and find in the heavens the power to repel any foes? Will your new empire shine through the ages of history? = Raja yang mutlak, rakyatmu membutuhkanmu untuk menyelamatkan kebudayaan dan pengetahuan Maya yang hebat. Akankah engkau dapat membaca gerakan bintang-bintang, dan cari di surga kekuatan untuk mengusir segala musuh? Akankah kekaisaran barumu bersinar sepanjang zaman sejarah? Camazotz = Kamazotz Coyopa = Koyopa @@ -6752,7 +6752,7 @@ Do take care founding a religion soon, only about half the players in the game a Beliefs = Kepercayaan There are four types of beliefs: Pantheon, Founder, Follower and Enhancer beliefs. = Ada empat jenis kepercayaan: Kepercayaan Panteon, Pendiri, Pengikut, dan Penguat. -Pantheon and Follower beliefs apply to each city following your religion, while Founder and Enhancer beliefs only apply to the founder of a religion. = Kepercayaan Panteon dan Pendiri diterapkan pada setiap kota yang mengikuti agamamu, sedangkan Kepercayaan Pendiri dan Penguat hanya diterapkan untuk pendiri dari suatu agama. +Pantheon and Follower beliefs apply to each city following your religion, while Founder and Enhancer beliefs only apply to the founder of a religion. = Kepercayaan Panteon dan Pengikut diterapkan pada setiap kota yang mengikuti agamamu, sedangkan Kepercayaan Pendiri dan Penguat hanya diterapkan untuk pendiri dari suatu agama. Religion inside cities = Agama di dalam kota When founding a city, it won't follow a religion immediately. = Saat mendirikan sebuah kota, kota tersebut tidak akan secara langsung mengikuti agama. @@ -6866,7 +6866,7 @@ Overview screens = Layar selengkapnya Reveal known resources on world screen = Tampilkan sumber daya yang diketahui pada layar dunia In the Resources overview, click on a resource icon to center the world screen on tiles already discovered and providing this resource. = Pada gambaran Sumber Daya, klik salah satu ikon sumber daya untuk menyorot layar dunianya pada daerah yang sudah terjelajahi yang menyediakan sumber daya tersebut. # Requires translation! -Alternatively, click on the "Unimproved" number to center the world screen only on owned (by you or your allied City-states) tiles where the resource is not improved. = +Alternatively, click on the "Unimproved" number to center the world screen only on owned (by you or your allied City-states) tiles where the resource is not improved. = Selain itu, klik pada angka "Belum ditingkatkan" untuk memusatkan layar dunia hanya pada daerah yang dimiliki (olehmu atau Negara-kota sekutumu) yang di mana sumber daya tidak ditingkatkan. If more than one tile is available, click repeatedly on the notification to cycle through all of them. = Jika lebih dari satu daerah tersedia, klik beberapa kali pada notifikasi untuk melihat semuanya satu-satu. Show diagram line colors = Tampilkan warna garis diagram In Politics overview > Show diagram, you can click anywhere inside the diagram to display a table listing all relationship line colors and their meaning. = Di gambaran Politik > Tampilkan diagram, kamu dapat klik di mana pun dalam diagram untuk menampilkan tabel daftar semua warna garis hubungan dan artinya. diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 9cbb2da7e6..53f5f82c84 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -807,8 +807,8 @@ Auto-assign city production = Автоматичне виробництво у Auto-build roads = Автоматичне будівництво доріг Automated workers replace improvements = Автоматизовані працівники замінюють покращення Automated units move on turn start = Автоматичний рух підрозділів на початку ходу -Automated units can upgrade = Автоматизовані підрозділи можна вдосконалити -Automated units choose promotions = Оберіть підвищення для автоматизованих підрозділів +Automated units can upgrade = Автоматизовані підрозділи можуть вдосконалюватись +Automated units choose promotions = Автоматизовані підрозділи самі обирають підвищення Cities auto-bombard at end of turn = Міста автоматично обстрілюють ворога в кінці ходу Order trade offers by amount = Сортувати торгові пропозиції за кількістю Ask for confirmation when pressing next turn = Питати підтвердження наступного ходу @@ -846,7 +846,7 @@ Screen orientation = Орієнтація екрану Landscape (fixed) = Ландшафтна Portrait (fixed) = Портретна Auto (sensor adjusted) = Автоматична -Enable using display cutout areas = Умімкнути використання обрізаних областей екрану +Enable using display cutout areas = Увімкнути використання обрізаних областей екрану Hide system status and navigation bars = Приховати системні статусну і навігаційну панелі Font family = Тип шрифту Font size multiplier = Коефіцієнт розміру шрифту @@ -895,11 +895,11 @@ AutoPlay until victory = Авто-гра до перемоги Start AutoPlay = Почати Авто-гру AutoPlay End Turn = Зупинити авто-гру на ході # Requires translation! -AutoPlay Military Once = +AutoPlay Military Once = Авто-грати військами один раз # Requires translation! -AutoPlay Civilians Once = +AutoPlay Civilians Once = Авто-грати цивільними один раз # Requires translation! -AutoPlay Economy Once = +AutoPlay Economy Once = Авто-грати економікою один раз # Notifications @@ -1116,7 +1116,7 @@ Next unit = Наступний підрозділ Fog of War = Туман війни Pick a policy = Обрати політику # Requires translation! -Move Spies = +Move Spies = Пересунути шпигунів Movement = Переміщення Strength = Сила Ranged strength = Сила у дальньому бою @@ -1292,7 +1292,7 @@ Move to city = Перейти до міста Reset Citizens = Скинути позиції міщан Citizen Management = Управління міщанами # Requires translation! -Citizen Focus = +Citizen Focus = Фокус міщан Avoid Growth = Уникати зростання Manual = Вручну Please enter a new name for your city = Вкажіть нову назву міста @@ -2086,7 +2086,7 @@ May not generate great prophet equivalents naturally = Видатні проро [relativeAmount]% spy effectiveness [cityFilter] = шпигунська ефективність [relativeAmount]% [cityFilter] [relativeAmount]% enemy spy effectiveness [cityFilter] = ворожа шпигунська ефективність [relativeAmount]% [cityFilter] # Requires translation! -New spies start with [amount] level(s) = +New spies start with [amount] level(s) = Нові шпигуни починають з рівнем [amount] Starting tech = Початкова технологія Starts with [tech] = Розпочинає гру з технологією [tech] Starts with [policy] adopted = Починається, коли прийнято [policy] @@ -2309,9 +2309,9 @@ starting from the [era] = починаючи з [era] if starting in the [era] = якщо розпочати гру в [era] on [speed] game speed = на швидкості гри [speed] # Requires translation! -when [victoryType] Victory is enabled = +when [victoryType] Victory is enabled = коли увімкнена перемога [victoryType] # Requires translation! -when [victoryType] Victory is disabled = +when [victoryType] Victory is disabled = коли вимкнена перемога [victoryType] if no other Civilization has researched this = якщо жодна інша Цивілізація не дослідила це after discovering [tech] = після дослідження технології [tech] before discovering [tech] = перед дослідженням технології [tech] @@ -2613,7 +2613,7 @@ TriggerCondition = Умова тригера UnitTriggerCondition = Умова активації підрозділом UnitActionModifier = Модифікатор дії підрозділу # Requires translation! -MetaModifier = +MetaModifier = Мета-модифікатор #################### Lines from spy actions ####################### @@ -2647,7 +2647,7 @@ You attacked City-States that were under our protection! = Ви атакувал You demanded tribute from City-States that were under our protection! = Ви вимагали данину у Міст-держав, які були під нашим захистом! You sided with a City-State over us = Ви прийняли бік Міста-держави у війні проти нас # Requires translation! -You spied on us! = +You spied on us! = Ти шпигував за нами! Years of peace have strengthened our relations. = Роки миру зміцнили наші відносини. Our mutual military struggle brings us closer together. = Наша взаємна військова боротьба зближує нас. We applaud your liberation of conquered cities! = Ми вдячні вам за визволення завойованих міст! @@ -2670,7 +2670,7 @@ Main Menu = Головне меню World Screen = Екран світу AutoPlay menu = Меню авто-гри # Requires translation! -NextTurn menu = +NextTurn menu = Меню наступного ходу Map Panning = Пересування мапи Unit Actions = Дії підрозділу City Screen = Екран міста @@ -6947,4 +6947,3 @@ Miscellaneous = Різне External links = Зовнішні посилання External links support right-click or long press to copy the link to the clipboard instead of launching the browser. = Зовнішні посилання підтримують правий клік або довге натиснення для копіювання посилання в буфер обміну замість відкриття браузера. Example: The 'Open Github page' button on the Mod management screen. = Приклад: кнопка 'Відкрити сторінку Github' на екрані керування Модами. - diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 35e8527a7b..0da5b1136e 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.8.21" const val appName = "Unciv" - const val appCodeNumber = 995 - const val appVersion = "4.11.11" + const val appCodeNumber = 996 + const val appVersion = "4.11.12" const val gdxVersion = "1.12.1" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index f0c7bba3e7..122c334c18 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,18 @@ +## 4.11.12 + +By tuvus: +- More espionage UI improvements +- City state election rigging + +By SomeTroglodyte: +- Fix "Move a unit" tutorial isn't completed by moving via right-click +- Architecture overhaul: openCivilopedia and "hey, who knows which Ruleset we're running"? +- Fix "Translating" wiki link + +Added the culture-refunding remove policy unique - By PLynx01 + +Corrected Coast yields to give 1 Food and 1 Gold - By Skekdog + ## 4.11.11 Nuclear weapon uniques accept conditionals diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index ed7aeec789..e957da62ed 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -471,7 +471,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.11.11", 995) + val VERSION = Version("4.11.12", 996) //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/996.txt b/fastlane/metadata/android/en-US/changelogs/996.txt new file mode 100644 index 0000000000..faf57e4e6e --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/996.txt @@ -0,0 +1,14 @@ + + +By tuvus: +- More espionage UI improvements +- City state election rigging + +By SomeTroglodyte: +- Fix "Move a unit" tutorial isn't completed by moving via right-click +- Architecture overhaul: openCivilopedia and "hey, who knows which Ruleset we're running"? +- Fix "Translating" wiki link + +Added the culture-refunding remove policy unique - By PLynx01 + +Corrected Coast yields to give 1 Food and 1 Gold - By Skekdog \ No newline at end of file