diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index cb3776fa35..f662733532 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -147,8 +147,7 @@ We will remember this. = Nós iremos lembrar disto. [civName] has declared war on [targetCivName]! = [civName] declarou guerra contra [targetCivName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] e [targetCivName] assinaram um Tratado de Paz! - # Requires translation! -Declaration of Friendship = +Declaration of Friendship = Declaração de Amizade [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] e [targetCivName] assinaram a Declaração de Amizade! [civName] has denounced [targetCivName]! = [civName] condenou [targetCivName]! Do you want to break your promise to [leaderName]? = Deseja quebrar sua promessa com [leaderName]? @@ -1195,10 +1194,8 @@ Buy for [amount] gold = Comprar por [amount] de Ouro Buy = Comprar Currently you have [amount] [stat]. = Atualmente você tem [amount] [stat]. Would you like to purchase [constructionName] for [buildingGoldCost] [stat]? = Gostaria de comprar [constructionName] para [buildingGoldCost] [stat]? - # Requires translation! -You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = - # Requires translation! -Are you really sure you want to purchase this unit? = +You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = Você está comprando uma unidade religiosa em uma cidade que não segue a religião que você fundou ([yourReligion]). Isto significa que a unidade está ligada a essa religião estrangeira ([majorityReligion]) e será menos útil. +Are you really sure you want to purchase this unit? = Você tem certeza de que deseja comprar esta unidade? Purchase = Comprar No space available to place [unit] near [city] = Não há espaço disponível para colocar [unit] perto de [city] Maintenance cost = Custo de manutenção @@ -2592,8 +2589,7 @@ Great People Detail = Detalhe de Grande Pessoa Specialist Detail = Detalhe do Especialista Religion Detail = Detalhe da Religião Buildings Detail = Detalhe dos Edifícios - # Requires translation! -Open the Search Dialog = +Open the Search Dialog = Abrir janela de pesquisa Confirm Dialog = Confirmar Diálogo Cancel Dialog = Cancelar Diálogo Upgrade All = Melhorar tudo @@ -5949,8 +5945,7 @@ Sabratha = Sabratha Rusadir = Rusadir Baecula = Baecula Saldae = Saldae - # Requires translation! -Comment [comment] tiles take [] damage] = +Comment [comment] tiles take [] damage] = Comentário [comment] paineis recebem [] dano] Theodora = Theodora It is always a shame to destroy a thing of beauty. Happily, you are not one. = É sempre uma pena destruir uma coisa bela. Felizmente, você não é um. diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 6966338329..0c85a1e194 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -148,7 +148,7 @@ We will remember this. = Nous nous en souviendrons. [civName] has declared war on [targetCivName]! = [civName] a déclaré la guerre à la civilisation [targetCivName] ! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] et [targetCivName] ont signé un traité de paix ! # Requires translation! -Declaration of Friendship = +Declaration of Friendship = Déclaration d'Amitié [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] et [targetCivName] ont signé une Déclaration d'Amitié ! [civName] has denounced [targetCivName]! = [civName] a dénoncé la civilisation [targetCivName] ! Do you want to break your promise to [leaderName]? = Voulez-vous rompre votre promesse à [leaderName] ? @@ -1196,9 +1196,9 @@ Buy = Acheter Currently you have [amount] [stat]. = Vous avez actuellement [amount] [stat]. Would you like to purchase [constructionName] for [buildingGoldCost] [stat]? = Voulez-vous acheter [constructionName] pour [buildingGoldCost] [stat] ? # Requires translation! -You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = +You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = Vous achetez une unité religieuse dans une cité ne pratiquant pas la religion que vous avez fondée ([yourReligion]). Cela signifie que cette unité est liée à une religion étrangère ([majorityReligion]) et sera peu utile. # Requires translation! -Are you really sure you want to purchase this unit? = +Are you really sure you want to purchase this unit? = Êtes-vous vraiment sûr(e) de vouloir acheter cette unité ? Purchase = Acheter No space available to place [unit] near [city] = Aucun espace disponible pour placer [unit] près de [city] Maintenance cost = Coût d'entretien @@ -2593,7 +2593,7 @@ Specialist Detail = Détails des Spécialistes Religion Detail = Détails de la religion Buildings Detail = Détails des bâtiments # Requires translation! -Open the Search Dialog = +Open the Search Dialog = Ouvrir la fenêtre de recherche Confirm Dialog = Confirmer (boîte de dialogue) Cancel Dialog = Annuler (boîte de dialogue) Upgrade All = Améliorer tous diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index ee1ed1ed85..4a4e1d08e3 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -147,8 +147,7 @@ We will remember this. = Non credere che ce lo scorderemo! [civName] has declared war on [targetCivName]! = [civName] ha dichiarato guerra a [targetCivName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] ha siglato una pace con [targetCivName]! - # Requires translation! -Declaration of Friendship = +Declaration of Friendship = Dichiarazione d'Amicizia [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] e [targetCivName] hanno stretto una Dichiarazione d'Amicizia! [civName] has denounced [targetCivName]! = [civName] ha denunciato [targetCivName]! Do you want to break your promise to [leaderName]? = Hai promesso a [leaderName] che avresti smesso di fondare città vicino ai suoi territori. Fondare questa città sarà considerato un atto di tradimento. Vuoi davvero continuare? @@ -1195,10 +1194,8 @@ Buy for [amount] gold = Acquista ([amount] oro) Buy = Acquista Currently you have [amount] [stat]. = Al momento possiedi [amount] [stat]. Would you like to purchase [constructionName] for [buildingGoldCost] [stat]? = Vuoi acquistare [constructionName] per [buildingGoldCost] [stat]? - # Requires translation! -You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = - # Requires translation! -Are you really sure you want to purchase this unit? = +You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = Stai acquistando un'unità religiosa legata alla religione [majorityReligion], diversa da [yourReligion], religione da te fondata, e questo la renderà molto meno utile. +Are you really sure you want to purchase this unit? = Vuoi davvero acquistare questa unità? Purchase = Acquista No space available to place [unit] near [city] = Spazio insufficiente per posizionare [unit] vicino a [city] Maintenance cost = Costi di mantenimento @@ -2593,8 +2590,7 @@ Great People Detail = Dettagli Grandi Personaggi Specialist Detail = Dettagli specialisti Religion Detail = Dettagli Religione Buildings Detail = Dettagli edifici - # Requires translation! -Open the Search Dialog = +Open the Search Dialog = Apri dialogo Cerca Confirm Dialog = Conferma dialogo Cancel Dialog = Cancella dialogo Upgrade All = Aggiorna tutto diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 820bc25789..1b64bd175d 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -152,8 +152,8 @@ We will remember this. = 우리는 이 일을 기억할 것입니다. [civName] has declared war on [targetCivName]! = [civName]이(가) [targetCivName]에게 선전포고했습니다! [civName] and [targetCivName] have signed a Peace Treaty! = [civName]와(과) [targetCivName]이(가) 평화 협정을 맺었습니다! # Requires translation! -Declaration of Friendship = -[civName] and [targetCivName] have signed the Declaration of Friendship! = [civName]와(과) [targetCivName]이(가) 동맹을 맺었습니다! +Declaration of Friendship = 우호 선언 +[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 = 약속 파기 @@ -275,7 +275,7 @@ Sum: = 합계 Trade = 거래 Offer trade = 거래 제안 # Requires translation! -They'll decide on their turn = +They'll decide on their turn = 본인 차례에 결정함 Retract offer = 거래 취소 What do you have in mind? = 어떻게 생각하십니까? Our items = 우리 물품 @@ -313,9 +313,9 @@ Upgrade all [count] [unit] ([cost] gold) = [unit] [count]기 전원 업그레이 National ability = 문명 특성 [firstValue] vs [secondValue] = [firstValue] vs [secondValue] # Requires translation! -Gained = +Gained = 획득: # Requires translation! -Lost = +Lost = 상실: # New game screen @@ -513,7 +513,7 @@ Base and terrain features = 기본 및 추가지형 Base terrain only = 기본지형만 Land or water only = 물/땅만 # Requires translation! -Import a Wesnoth map = +Import a Wesnoth map = 웨스노스 지도 불러오기 ## Labels/messages Brush ([size]): = 브러시 ([size]칸) @@ -2040,7 +2040,7 @@ Roads connect tiles across rivers = 도로가 강을 가로질러 연결됨 [relativeAmount]% maintenance on road & railroads = 도로와 철도의 유지비 [relativeAmount]% No Maintenance costs for improvements in [tileFilter] tiles = [tileFilter]에 건설된 시설 유지비 없음 # Requires translation! -[relativeAmount]% construction time for [improvementFilter] improvements = +[relativeAmount]% construction time for [improvementFilter] improvements = [improvementFilter] 시설 건설 시간 [relativeAmount]% [relativeAmount]% maintenance cost for buildings [cityFilter] = [cityFilter]의 건물 유지비 [relativeAmount]% # Requires translation! Remove [buildingFilter] [cityFilter] = @@ -6856,4 +6856,3 @@ In the Resources overview, click on a resource icon to center the world screen o Alternatively, click on the "Unimproved" number to center the world screen only on owned tiles where the resource is not improved. = # Requires translation! If more than one tile is available, click repeatedly on the notification to cycle through all of them. = - diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 17ea1b7278..46ac2b4e2a 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -149,7 +149,7 @@ We will remember this. = Zapamiętamy to! [civName] has declared war on [targetCivName]! = Cywilizacja [civName] wypowiedziała wojnę cywilizacji [targetCivName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] oraz [targetCivName] podpisują Traktat Pokojowy! # Requires translation! -Declaration of Friendship = +Declaration of Friendship = Deklaracja Przyjaźni [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] oraz [targetCivName] podpisują Deklarację Przyjaźni! [civName] has denounced [targetCivName]! = Cywilizacja [civName] potępiła cywilizację [targetCivName]! Do you want to break your promise to [leaderName]? = Czy chcesz zerwać umowę z [leaderName]? @@ -1197,9 +1197,9 @@ Buy = Kup za Currently you have [amount] [stat]. = Obecnie posiadamy [amount] [stat] Would you like to purchase [constructionName] for [buildingGoldCost] [stat]? = Czy chcesz kupić [constructionName] za [buildingGoldCost] [stat]? # Requires translation! -You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = +You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = Kupujesz jednostkę religijną w mieście które nie wyznaje założonej przez Ciebie religii ([yourReligion]). Ta jednostka będzie wyznawała obcą religię ([majorityReligion]) i może być przez to mniej przydatna. # Requires translation! -Are you really sure you want to purchase this unit? = +Are you really sure you want to purchase this unit? = Czy na pewno chcesz kupić tę jednostkę? Purchase = Kup No space available to place [unit] near [city] = Brak miejsca dla umieszczenie jednostki [unit] w pobliżu miasta [city] Maintenance cost = Koszt utrzymania @@ -2594,7 +2594,7 @@ Specialist Detail = Szczegóły Specjalistów Religion Detail = Szczegóły wierzeń Buildings Detail = Szczegóły budynków # Requires translation! -Open the Search Dialog = +Open the Search Dialog = Otwórz Okno Wyszukiwania Confirm Dialog = Potwierdź okno dialogowe Cancel Dialog = Anuluj okno dialogowe Upgrade All = Ulepsz wszystkie diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index d40678128d..081e7e78a2 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -148,7 +148,7 @@ We will remember this. = Мы это запомним. [civName] has declared war on [targetCivName]! = [civName] объявляет войну державе [targetCivName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] и [targetCivName] подписали мирное соглашение! # Requires translation! -Declaration of Friendship = +Declaration of Friendship = Декларация дружбы [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]? @@ -866,11 +866,11 @@ Multi-turn AutoPlay amount = Количество ходов авто-игры Start AutoPlay = Начать авто-игру # Requires translation! -AutoPlay End Turn = +AutoPlay End Turn = Закончить ход (Авто-игра) # Requires translation! -AutoPlay Military Once = +AutoPlay Military Once = Авто-игра воен. юнитами один раз # Requires translation! -AutoPlay Civilians Once = +AutoPlay Civilians Once = Авто-игра гражд. юнитами один раз # Requires translation! AutoPlay Economy Once = @@ -1200,9 +1200,9 @@ Buy = Купить Currently you have [amount] [stat]. = В данный момент у вас имеется [amount] [stat]. Would you like to purchase [constructionName] for [buildingGoldCost] [stat]? = Вы хотите купить [constructionName] за [buildingGoldCost] [stat]? # Requires translation! -You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = +You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = Вы покупаете религиозного юнита в городе, который не исповедует основанную вами религию ([yourReligion]). Это значит, что этот юнит будет связан с чужеземной религией ([majorityReligion]) и потому менее полезен. # Requires translation! -Are you really sure you want to purchase this unit? = +Are you really sure you want to purchase this unit? = Вы уверены, что хотите приобрести данный юнит? Purchase = Купить No space available to place [unit] near [city] = Возле города [city] нет места, чтобы разместить юнит [unit] Maintenance cost = Стоимость обслуживания @@ -2597,7 +2597,7 @@ Specialist Detail = Специалисты подробно Religion Detail = Религия подробно Buildings Detail = Здания подробно # Requires translation! -Open the Search Dialog = +Open the Search Dialog = Открыть поисковую строку Confirm Dialog = Подтвердить Cancel Dialog = Отклонить Upgrade All = Модернизировать все diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 70986f4f71..b084a9fe7f 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 = 943 - const val appVersion = "4.9.8" + const val appCodeNumber = 944 + const val appVersion = "4.9.9" const val gdxVersion = "1.12.1" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index c726450967..9cc5b97473 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,19 @@ +## 4.9.9 + +Deprecate old religion uniques - finally!!! Months in the making! + +By SeventhM: +- Avoid crash in mod checker for mods with undefined tech requirements +- Fix stats from tileFilter unique not working on improvements +- Add damage dealing unit trigger +- Fix not getting unique unit from tile based free unit trigger (For real this time) + +By soggerr: +- Show average damage in battle calculations +- Allow battle calculations when not your turn + +Change Gdx version for android:texturePacker gradle task - By SomeTroglodyte + ## 4.9.8 Add new map types - By remdu diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 6b8c6a5aeb..ead7e9c159 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -464,7 +464,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.9.8", 943) + val VERSION = Version("4.9.9", 944) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/944.txt b/fastlane/metadata/android/en-US/changelogs/944.txt new file mode 100644 index 0000000000..43e8b20ae9 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/944.txt @@ -0,0 +1,15 @@ + + +Deprecate old religion uniques - finally!!! Months in the making! + +By SeventhM: +- Avoid crash in mod checker for mods with undefined tech requirements +- Fix stats from tileFilter unique not working on improvements +- Add damage dealing unit trigger +- Fix not getting unique unit from tile based free unit trigger (For real this time) + +By soggerr: +- Show average damage in battle calculations +- Allow battle calculations when not your turn + +Change Gdx version for android:texturePacker gradle task - By SomeTroglodyte \ No newline at end of file