From 3b66009dd2da2956b7e5629bc6224401e2ca19ea Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 4 Jan 2024 09:15:49 +0200 Subject: [PATCH] Version rollout (#10869) * Bump version and create initial changelog entry * Update Hungarian.properties (#10864) [...] -> (...) * Fix some right-side uses of square brackets in translations (#10861) * Update Korean.properties (#10860) * Update Indonesian.properties (#10859) Fix extra placeholder issue * Update Brazilian_Portuguese.properties (#10856) * Update Latin.properties (#10849) --------- Co-authored-by: yairm210 Co-authored-by: balazsszalab Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com> Co-authored-by: Yattong the Mackerel Co-authored-by: kensvin Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 9 +++---- .../jsons/translations/Hungarian.properties | 8 +++---- .../jsons/translations/Indonesian.properties | 2 +- .../jsons/translations/Korean.properties | 2 +- .../jsons/translations/Latin.properties | 24 +++++++++---------- .../jsons/translations/Lithuanian.properties | 3 +-- .../jsons/translations/Vietnamese.properties | 3 +-- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- changelog.md | 19 +++++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/952.txt | 18 ++++++++++++++ 11 files changed, 63 insertions(+), 31 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/952.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index c2af2eb567..08495e0a54 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1257,11 +1257,9 @@ Unlock = Destrancar Move to city = Mover para a cidade Reset Citizens = Reiniciar Cidadãos Citizen Management = Gestão de Cidadãos - # Requires translation! -Citizen Focus = +Citizen Focus = Foco Cidadão Avoid Growth = Evitar o Crescimento - # Requires translation! -Manual = +Manual = Manual Please enter a new name for your city = Por favor coloque um novo nome para sua cidade Please select a tile for this building's [improvement] = Por favor, selecione um painel para a [improvement] dessa construção Move to the top of the queue = Mover para o topo da fila @@ -2082,8 +2080,7 @@ Can perform Air Sweep = Pode executar varredura de ar Can speed up construction of a building = Pode acelerar a construção de um edifício Can speed up the construction of a wonder = Pode acelerar a construção de uma maravilha Can hurry technology research = Pode apressar pesquisa tecnológica - # Requires translation! -Can generate a large amount of culture = +Can generate a large amount of culture = Pode gerar uma grande quantidade de cultura Can undertake a trade mission with City-State, giving a large sum of gold and [amount] Influence = Pode assumir uma missão de troca com Cidade-Estado, obtendo uma grande quantia de ouro e [amount] de Influência Can transform to [unit] = Pode se transformar em [unit] [relativeAmount]% Strength = [relativeAmount]% de força diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index e90835eb65..a72f16b5fb 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -2798,7 +2798,7 @@ Colosseum = Colosseum Circus Maximus = Circus Maximus Great Wall = Kínai nagy fal -'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'A hadviselésnek törvénye legyen tehát: [...] soha ne bízzuk magunkat arra, hogy (az ellenség) nem támad meg bennünket, hanem kövessünk el mindent, hogy ne is legyen módja megtámadni bennünket.' - Szun-ce +'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'A hadviselésnek törvénye legyen tehát: (...) soha ne bízzuk magunkat arra, hogy (az ellenség) nem támad meg bennünket, hanem kövessünk el mindent, hogy ne is legyen módja megtámadni bennünket.' - Szun-ce Temple = Templom @@ -2809,7 +2809,7 @@ Mud Pyramid Mosque = Vályogpiramis National College = Nemzeti Főiskola The Oracle = Jósda -'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing' - Socrates = 'Delphoiba is elment, és ilyen jóslatot mert kérni [...] Püthia pedig azt a választ adta, hogy nálam senki sem bölcsebb. [...] Az közületek a legbölcsebb, emberek, aki, mint Szókratész, felismerte, hogy bölcsesség tekintetében valójában semmit sem ér.' - Platón: Szókrátész védőbeszéde +'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing' - Socrates = 'Delphoiba is elment, és ilyen jóslatot mert kérni (...) Püthia pedig azt a választ adta, hogy nálam senki sem bölcsebb. (...) Az közületek a legbölcsebb, emberek, aki, mint Szókratész, felismerte, hogy bölcsesség tekintetében valójában semmit sem ér.' - Platón: Szókrátész védőbeszéde National Epic = Nemzeti Eposz @@ -2861,14 +2861,14 @@ Wat = Vat Oxford University = Oxfordi Egyetem Notre Dame = Notre Dame -'Architecture has recorded the great ideas of the human race. Not only every religious symbol, but every human thought has its page in that vast book.' - Victor Hugo = '[...] az építészet volt az emberi nem egyetemes írása. És ez annyira igaz, hogy ebben a roppant könyvben nemcsak minden vallásos jelképnek, hanem minden emberi gondolatnak is megvan a maga lapja és a maga emléke.' - Victor Hugo +'Architecture has recorded the great ideas of the human race. Not only every religious symbol, but every human thought has its page in that vast book.' - Victor Hugo = '(...) az építészet volt az emberi nem egyetemes írása. És ez annyira igaz, hogy ebben a roppant könyvben nemcsak minden vallásos jelképnek, hanem minden emberi gondolatnak is megvan a maga lapja és a maga emléke.' - Victor Hugo Castle = Kastély Mughal Fort = Mogul erőd Himeji Castle = Himedzsi várkastély -'Bushido is realized in the presence of death. This means choosing death whenever there is a choice between life and death. There is no other reasoning.' - Yamamoto Tsunetomo = 'Rájöttem, hogy a Busido a halálban gyökerezik. Ha dönteni kell élet és halál között, az embernek habozás nélkül a halált kell választania; ez nem különösebben nehéz [...]' - Jamamoto Cunetomo +'Bushido is realized in the presence of death. This means choosing death whenever there is a choice between life and death. There is no other reasoning.' - Yamamoto Tsunetomo = 'Rájöttem, hogy a Busido a halálban gyökerezik. Ha dönteni kell élet és halál között, az embernek habozás nélkül a halált kell választania; ez nem különösebben nehéz (...)' - Jamamoto Cunetomo Ironworks = Vasművek diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 3c57c0bc78..d53241ae2c 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -943,7 +943,7 @@ An enemy [RangedUnit] has destroyed the defence of [cityName] = [RangedUnit] mus An enemy [RangedUnit] ([amount] HP) has destroyed the defence of [cityName] ([amount2] HP) = [RangedUnit] musuh ([amount] HP) telah menghancurkan perlindungan Kota [cityName] ([amount2] HP) Enemy city [cityName] has destroyed our [ourUnit] = Kota [cityName] musuh telah menghancurkan [ourUnit] kita Enemy city [cityName] ([amount] HP) has destroyed our [ourUnit] ([amount2] HP) = Kota [cityName] ([amount] HP) musuh telah menghancurkan [ourUnit] kita ([amount2] HP) -An enemy [unit] was destroyed while attacking [cityName] = [unit] musuh ([amount] HP) telah dihancurkan ketika menyerang Kota [cityName] ([amount2] HP) +An enemy [unit] was destroyed while attacking [cityName] = [unit] musuh telah dihancurkan ketika menyerang Kota [cityName] An enemy [unit] ([amount] HP) was destroyed while attacking [cityName] ([amount2] HP) = [unit] musuh ([amount] HP) telah dihancurkan ketika menyerang Kota [cityName] ([amount2] HP) An enemy [unit] was destroyed while attacking our [ourUnit] = [unit] musuh telah dihancurkan ketika menyerang [ourUnit] kita An enemy [unit] ([amount] HP) was destroyed while attacking our [ourUnit] ([amount2] HP) = [unit] musuh ([amount] HP) telah dihancurkan ketika menyerang [ourUnit] kita ([amount2] HP) diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index dc87cc38de..70e9ddc297 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -611,7 +611,7 @@ These [numberOfPlayers] players will be adjusted = Set current user = 현재 사용자 설정 Player ID from clipboard = 클립보드의 플레이어 ID Player ID from friends list = 친구 목록의 유저ID -To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = 멀티플레이를 하려면 방장은 [새 게임]에서 '멀티플레이'에 체크하고 각 플레이어의 유저ID를 입력해야 합니다. +To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = 멀티플레이를 하려면 방장은 '새 게임'에서 '멀티플레이'에 체크하고 각 플레이어의 유저ID를 입력해야 합니다. You can assign your own user ID there easily, and other players can copy their user IDs here and send them to you for you to include them in the game. = 참가자들은 '유저ID 복사' 를 눌러서 ID를 방장에게 보내면 됩니다. Once you've created your game, the Game ID gets automatically copied to your clipboard so you can send it to the other players. = 게임을 만들면 게임ID가 클립보드에 자동으로 복사되므로(또는 메인메뉴 - 멀티플레이 - 해당 게임 선택후 복사) 방장이 이것을 참가자들에게 보내면 됩니다. Players can enter your game by copying the game ID to the clipboard, and clicking on the 'Add multiplayer game' button = 참가자들은 게임ID를 복사하여 '멀티플레이 추가' 의 게임ID 란에 붙여넣으면 됩니다. diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index 141fb3afbc..e7a7ba800e 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -1,4 +1,4 @@ -# Language settings +3+# Language settings # Equivalent of a space in your language # If your language doesn't use spaces, just add "" as a translation, otherwise " " @@ -338,27 +338,27 @@ Currently you have killed [amount] of their military units. = You need to find them first! = # Requires translation! -Cultured = +Cultured = Statum Culturae # Requires translation! -Maritime = +Maritime = Statum Maritimum # Requires translation! -Mercantile = +Mercantile = Statum Mercatus # Requires translation! -Religious = +Religious = Statum Religiosum # Requires translation! -Militaristic = +Militaristic = Statum Militare # Requires translation! -Type = +Type = Genus # Requires translation! -Friendly = +Friendly = Amicum # Requires translation! -Hostile = +Hostile = Inimicum # Requires translation! -Irrational = +Irrational = Absurdum # Requires translation! -Personality = +Personality = Persona # Requires translation! -Influence = +Influence = Influentia # Requires translation! Ally: [civilization] with [amount] Influence = diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index fc09a8b809..a8ac1832b0 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -5837,7 +5837,7 @@ Ceilidh Hall = Ceilidh salė Leaning Tower of Pisa = Pizos bokštas -'Don't clap too hard - it's a very old building.' - John Osbourne = 'Arba anie aštuoniolika, kuriuos užgriuvo bokštas prie Siloamo [tvenkinio] ir užmušė; jūs manote, kad jie buvo kaltesni už visus kitus Jeruzalės gyventojus?! Ne, sakau jums, bet jei neatsiversite, visi taip pat pražūsite“.' - Luko 13:4-5 +'Don't clap too hard - it's a very old building.' - John Osbourne = 'Arba anie aštuoniolika, kuriuos užgriuvo bokštas prie Siloamo tvenkinio ir užmušė; jūs manote, kad jie buvo kaltesni už visus kitus Jeruzalės gyventojus?! Ne, sakau jums, bet jei neatsiversite, visi taip pat pražūsite“.' - Luko 13:4-5 Coffee House = Kavinė @@ -7157,4 +7157,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/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 8cfdbdf76b..aa309634e3 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -2302,7 +2302,7 @@ Cities are razed [amount] times as fast = Các thành phố được xếp hạn Receive a tech boost when scientific buildings/wonders are built in capital = Nhận được sự thúc đẩy công nghệ khi các tòa nhà / kỳ quan khoa học được xây dựng bằng thủ đô Can be continually researched = Có thể liên tục nghiên cứu [relativeAmount]% Golden Age length = [relativeAmount]% Độ dài thời kỳ Hoàng Kim -Population loss from nuclear attacks [relativeAmount]% [cityFilter] = Tổn thất dân số do các cuộc tấn công hạt nhân [relativeAmount]% [cityFilter] Tổn thất dân số do các cuộc tấn công hạt nhân [relAmount]% [cityFilter] Tổn thất dân số do các cuộc tấn công hạt nhân [relAmount]% [cityFilter] +Population loss from nuclear attacks [relativeAmount]% [cityFilter] = Tổn thất dân số do các cuộc tấn công hạt nhân [relativeAmount]% [cityFilter] # Requires translation! Damage to garrison from nuclear attacks [relativeAmount]% [cityFilter] = Rebel units may spawn = Các đơn vị nổi dậy có thể xuất hiện @@ -7152,4 +7152,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/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 024bf31be8..e7fe4d7541 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 = 951 - const val appVersion = "4.9.15" + const val appCodeNumber = 952 + const val appVersion = "4.9.16" const val gdxVersion = "1.12.1" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index c3ff5afda9..34eb682759 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,22 @@ +## 4.9.16 + +By SeventhM: +- Change the icons from some units/buildings +- Add unique to allow for generalized great generals + +Show carried hammers from mid turn obsolete units - By soggerr + +By tuvus: +- Fixed crash when a worker tries to build a cached improvement that it can't build +- valueCityStateAlliance no longer causes a crash when the city-state has not been met + +By SomeTroglodyte: +- Wiki: Texture packing updated +- City-stationed unit icons get a circular touchable area +- Minor ImprovementPicker linting + +set minimum max coast extension to 1 - By remdu + ## 4.9.15 Added Tile Breakdown table, accessible by clicking on the stats in tile info table diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 1696c4f555..5d01812a76 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.15", 951) + val VERSION = Version("4.9.16", 952) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/952.txt b/fastlane/metadata/android/en-US/changelogs/952.txt new file mode 100644 index 0000000000..9c4928a91e --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/952.txt @@ -0,0 +1,18 @@ + + +By SeventhM: +- Change the icons from some units/buildings +- Add unique to allow for generalized great generals + +Show carried hammers from mid turn obsolete units - By soggerr + +By tuvus: +- Fixed crash when a worker tries to build a cached improvement that it can't build +- valueCityStateAlliance no longer causes a crash when the city-state has not been met + +By SomeTroglodyte: +- Wiki: Texture packing updated +- City-stationed unit icons get a circular touchable area +- Minor ImprovementPicker linting + +set minimum max coast extension to 1 - By remdu \ No newline at end of file