diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 16bcaf4c65..edcf17452b 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2357,8 +2357,7 @@ before enhancing a religion = antes de aprimorar uma religião after enhancing a religion = depois de aprimorar uma religião after generating a Great Prophet = depois de gerar um Grande Profeta if [buildingFilter] is constructed = se [buildingFilter] for construído - # Requires translation! -if [buildingFilter] is not constructed = +if [buildingFilter] is not constructed = se [buildingFilter] não for construído if [buildingFilter] is constructed in all [cityFilter] cities = se [buildingFilter] for construído em todas as cidades [cityFilter] if [buildingFilter] is constructed in at least [positiveAmount] of [cityFilter] cities = se [buildingFilter] for construído com pelo menos [positiveAmount] de [cityFilter] cidades if [buildingFilter] is constructed by anybody = se [buildingFilter] for construído por qualquer pessoa @@ -2487,8 +2486,7 @@ Can convert gold to science with sliders = Pode converter ouro em ciência com s Allow City States to spawn with additional units = Permitir que cidades-estados surjam com unidades adicionais Can trade civilization introductions for [positiveAmount] Gold = Pode comercializar introduções de civilização por [positiveAmount] Ouro Disable religion = Desativar religião - # Requires translation! -Can only start games from the starting era = +Can only start games from the starting era = Só pode iniciar jogos a partir da era inicial Allow raze capital = Permitir destruir capital Allow raze holy city = Permitir arrasar a cidade santa Mod is incompatible with [modFilter] = O mod é incompatível com [modFilter] @@ -2500,8 +2498,7 @@ Mod preselects map [comment] = Mod pré-seleciona mapa [comment] ######### countable ########### - # Requires translation! -year = +year = ano ######### combatantFilter ########### @@ -2540,15 +2537,12 @@ Air = Aéreo ######### civFilter ########### - # Requires translation! -AI player = - # Requires translation! -Human player = +AI player = Jogador IA +Human player = Jogador humano ######### nationFilter ########### - # Requires translation! -Major = +Major = Principal ######### City filters ########### @@ -2587,12 +2581,9 @@ in cities following this religion = nas cidades que seguem esta religião ######### buildingFilter ########### Building = Construção - # Requires translation! -National = - # Requires translation! -World Wonder = - # Requires translation! -World = +National = Nacional +World Wonder = Maravilha do Mundo +World = Mundial ######### Population Filters ########### @@ -2627,8 +2618,7 @@ All Road = Toda a estrada ######### simpleTerrain ########### - # Requires translation! -Elevated = +Elevated = Elevado ######### Region Types ########### diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index db339d4d00..16c3b1e18a 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2352,7 +2352,7 @@ after enhancing a religion = après avoir renforcé une religion after generating a Great Prophet = après avoir généré un Grand Prophète if [buildingFilter] is constructed = si un(e) [buildingFilter] est construit(e) # Requires translation! -if [buildingFilter] is not constructed = +if [buildingFilter] is not constructed = si un(e) [buildingFilter] n'est pas construit(e) if [buildingFilter] is constructed in all [cityFilter] cities = si un(e) [buildingFilter] est construit(e) dans toutes les villes [cityFilter] if [buildingFilter] is constructed in at least [positiveAmount] of [cityFilter] cities = si un(e) [buildingFilter] est construit(e) dans au moins [positiveAmount] villes [cityFilter] if [buildingFilter] is constructed by anybody = si un(e) [buildingFilter] est construit(e) par quiconque @@ -2482,7 +2482,7 @@ Allow City States to spawn with additional units = Autoriser la génération des Can trade civilization introductions for [positiveAmount] Gold = Possibilité d'échanger la rencontre d'une civilisation pour [positiveAmount] Or Disable religion = Désactiver la religion # Requires translation! -Can only start games from the starting era = +Can only start games from the starting era = Peut uniquement débuter la partie à l'ère de départ Allow raze capital = Autorisation de raser les capitales Allow raze holy city = Autorisation de raser les villes saintes Mod is incompatible with [modFilter] = Le mod est incompatible avec [modFilter] @@ -2495,7 +2495,7 @@ Mod preselects map [comment] = Le mod utilise la carte [comment] ######### countable ########### # Requires translation! -year = +year = année ######### combatantFilter ########### @@ -2535,14 +2535,14 @@ Air = Aérienne(s) ######### civFilter ########### # Requires translation! -AI player = +AI player = Joueur IA # Requires translation! -Human player = +Human player = Joueur humain ######### nationFilter ########### # Requires translation! -Major = +Major = Majeure(s) ######### City filters ########### @@ -2582,11 +2582,11 @@ in cities following this religion = dans les villes pratiquant cette religion Building = Bâtiment # Requires translation! -National = +National = National(es) # Requires translation! -World Wonder = +World Wonder = Merveille Mondiale # Requires translation! -World = +World = Mondial(es) ######### Population Filters ########### @@ -2622,7 +2622,7 @@ All Road = Toute Route ######### simpleTerrain ########### # Requires translation! -Elevated = +Elevated = Élevée(s) ######### Region Types ########### diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 014ad357d6..cde62c99fd 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2351,8 +2351,7 @@ before enhancing a religion = vor der Verbesserung einer Religion after enhancing a religion = nach der Verbesserung einer Religion after generating a Great Prophet = nach der Generierung eines Großen Propheten if [buildingFilter] is constructed = wenn [buildingFilter] gebaut wurde - # Requires translation! -if [buildingFilter] is not constructed = +if [buildingFilter] is not constructed = wenn [buildingFilter] nicht gebaut wurde if [buildingFilter] is constructed in all [cityFilter] cities = wenn [buildingFilter] in allen [cityFilter] Städten gebaut wurde if [buildingFilter] is constructed in at least [positiveAmount] of [cityFilter] cities = wenn [buildingFilter] in mindestens [positiveAmount] [cityFilter] Städten gebaut wurde if [buildingFilter] is constructed by anybody = wenn [buildingFilter] durch irgend jemanden gebaut wurde @@ -2481,8 +2480,7 @@ Can convert gold to science with sliders = Kann Gold in Wissenschaft mit Schiebe Allow City States to spawn with additional units = Erlauben, dass Stadtstaaten mit zusätzlichen Einheiten spawnen können Can trade civilization introductions for [positiveAmount] Gold = Kann Zivilisationsvorstellungen gegen [positiveAmount] Gold tauschen Disable religion = Religion deaktivieren - # Requires translation! -Can only start games from the starting era = +Can only start games from the starting era = Kann nur Spiele mit dem Startzeitalter starten Allow raze capital = Niederreißen von Hauptstädten zulassen Allow raze holy city = Niederreißen von heiligen Städten zulassen Mod is incompatible with [modFilter] = Mod ist nicht kompatibel mit [modFilter] @@ -2494,8 +2492,7 @@ Mod preselects map [comment] = Kartenvorauswahl der Mod [comment] ######### countable ########### - # Requires translation! -year = +year = Jahr ######### combatantFilter ########### @@ -2534,15 +2531,12 @@ Air = Luft ######### civFilter ########### - # Requires translation! -AI player = - # Requires translation! -Human player = +AI player = KI-Spieler +Human player = Menschlicher Spieler ######### nationFilter ########### - # Requires translation! -Major = +Major = Große ######### City filters ########### @@ -2581,12 +2575,9 @@ in cities following this religion = in Städten, die dieser Religion folgen ######### buildingFilter ########### Building = Gebäude - # Requires translation! -National = - # Requires translation! -World Wonder = - # Requires translation! -World = +National = National +World Wonder = Weltwunder +World = Welt ######### Population Filters ########### @@ -2621,8 +2612,7 @@ All Road = Alle Straßen ######### simpleTerrain ########### - # Requires translation! -Elevated = +Elevated = Erhöht ######### Region Types ########### diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index f87ef7c298..1054ec5744 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2352,7 +2352,7 @@ after enhancing a religion = setelah menguatkan agama after generating a Great Prophet = setelah memunculkan Nabi Besar if [buildingFilter] is constructed = jika [buildingFilter] telah dibangun # Requires translation! -if [buildingFilter] is not constructed = +if [buildingFilter] is not constructed = jika [buildingFilter] tidak dibangun if [buildingFilter] is constructed in all [cityFilter] cities = jika [buildingFilter] telah dibangun di semua [cityFilter] kota if [buildingFilter] is constructed in at least [positiveAmount] of [cityFilter] cities = jika setidaknya [buildingFilter] telah dibangun di [positiveAmount] [cityFilter] kota if [buildingFilter] is constructed by anybody = jika [buildingFilter] dibangun oleh siapa pun @@ -2482,7 +2482,7 @@ Allow City States to spawn with additional units = Perbolehkan Negara-Kota untuk Can trade civilization introductions for [positiveAmount] Gold = Dapat menjual perkenalan peradaban untuk [positiveAmount] Emas Disable religion = Matikan agama # Requires translation! -Can only start games from the starting era = +Can only start games from the starting era = Hanya dapat memulai permainan dari era awal Allow raze capital = Perbolehkan untuk meruntuhkan ibu kota Allow raze holy city = Perbolehkan untuk meruntuhkan kota suci Mod is incompatible with [modFilter] = Mod tidak kompatibel dengan [modFilter] @@ -2495,7 +2495,7 @@ Mod preselects map [comment] = Mod memilih peta sebelumnya [comment] ######### countable ########### # Requires translation! -year = +year = tahun ######### combatantFilter ########### @@ -2535,14 +2535,14 @@ Air = Udara ######### civFilter ########### # Requires translation! -AI player = +AI player = Pemain AI # Requires translation! -Human player = +Human player = Pemain manusia ######### nationFilter ########### # Requires translation! -Major = +Major = Besar ######### City filters ########### @@ -2582,11 +2582,11 @@ in cities following this religion = di kota-kota yang mengikuti agama ini Building = Bangunan # Requires translation! -National = +National = Nasional # Requires translation! -World Wonder = +World Wonder = Keajaiban Dunia # Requires translation! -World = +World = Dunia ######### Population Filters ########### @@ -2622,7 +2622,7 @@ All Road = Semua Jalan ######### simpleTerrain ########### # Requires translation! -Elevated = +Elevated = Dinaikkan ######### Region Types ########### diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 4b91cc8466..d68c95769d 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2357,8 +2357,7 @@ before enhancing a religion = prima di potenziare una religione after enhancing a religion = dopo aver potenziato una religione after generating a Great Prophet = dopo aver generato un Grande Profeta if [buildingFilter] is constructed = se [buildingFilter] è presente - # Requires translation! -if [buildingFilter] is not constructed = +if [buildingFilter] is not constructed = se [buildingFilter] non è presente if [buildingFilter] is constructed in all [cityFilter] cities = se [buildingFilter] è edificato in tutte le città [cityFilter] if [buildingFilter] is constructed in at least [positiveAmount] of [cityFilter] cities = se [buildingFilter] è costruito in almeno [positiveAmount] città [cityFilter] if [buildingFilter] is constructed by anybody = se chiunque ha costruito [buildingFilter] @@ -2487,8 +2486,7 @@ Can convert gold to science with sliders = Puoi convertire Oro in Scienza tramit Allow City States to spawn with additional units = Permetti alle Città-Stato di apparire con unità extra Can trade civilization introductions for [positiveAmount] Gold = Le introduzioni di civiltà fruttano [positiveAmount] Oro Disable religion = Disabilita religioni - # Requires translation! -Can only start games from the starting era = +Can only start games from the starting era = Puoi iniziare partite solo a partire dall'epoca Allow raze capital = Permetti il sacco delle capitali Allow raze holy city = Permetti il sacco delle città sante Mod is incompatible with [modFilter] = La mod è incompatibile con [modFilter] @@ -2500,8 +2498,7 @@ Mod preselects map [comment] = La mod preseleziona la mappa [comment] ######### countable ########### - # Requires translation! -year = +year = anno ######### combatantFilter ########### @@ -2540,15 +2537,12 @@ Air = aerea ######### civFilter ########### - # Requires translation! -AI player = - # Requires translation! -Human player = +AI player = Giocatore IA +Human player = Giocatore Umano ######### nationFilter ########### - # Requires translation! -Major = +Major = Maggiore ######### City filters ########### @@ -2587,12 +2581,9 @@ in cities following this religion = nelle città che seguono questa religione ######### buildingFilter ########### Building = Edificio - # Requires translation! -National = - # Requires translation! -World Wonder = - # Requires translation! -World = +National = Nazionale +World Wonder = Meraviglia Mondiale +World = Mondiale ######### Population Filters ########### @@ -2627,8 +2618,7 @@ All Road = Tutte le strade ######### simpleTerrain ########### - # Requires translation! -Elevated = +Elevated = Elevato ######### Region Types ########### diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 50b8ee3868..4f8fb043b8 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -2352,7 +2352,7 @@ after enhancing a religion = після покращення Релігії after generating a Great Prophet = після створення Видатного Пророка if [buildingFilter] is constructed = якщо створено [buildingFilter] # Requires translation! -if [buildingFilter] is not constructed = +if [buildingFilter] is not constructed = якщо [buildingFilter] не збудовано if [buildingFilter] is constructed in all [cityFilter] cities = якщо [buildingFilter] збудовано у всіх містах, які [cityFilter] if [buildingFilter] is constructed in at least [positiveAmount] of [cityFilter] cities = якщо [buildingFilter] збудовано щонайменше в [positiveAmount] містах [cityFilter] if [buildingFilter] is constructed by anybody = якщо [buildingFilter] вже збудовано будь-ким @@ -2482,7 +2482,7 @@ Allow City States to spawn with additional units = Дозволити міста Can trade civilization introductions for [positiveAmount] Gold = Можна торгувати знайомствами із іншими націями за [positiveAmount] ¤Золота Disable religion = Вимкнути релігію # Requires translation! -Can only start games from the starting era = +Can only start games from the starting era = Дозволити почати гру тільки з початкової ери Allow raze capital = Дозволити зруйнувати столицю Allow raze holy city = Дозволити зруйнувати святе місто Mod is incompatible with [modFilter] = Мод несумісний із [modFilter] @@ -2535,14 +2535,14 @@ Air = Повітряні ######### civFilter ########### # Requires translation! -AI player = +AI player = Гравець-ШІ # Requires translation! -Human player = +Human player = Гравець-людина ######### nationFilter ########### # Requires translation! -Major = +Major = Головний ######### City filters ########### @@ -2582,11 +2582,11 @@ in cities following this religion = у містах, що сповідують Building = Споруда # Requires translation! -National = +National = Національні # Requires translation! -World Wonder = +World Wonder = Світові дива # Requires translation! -World = +World = Світові ######### Population Filters ########### @@ -2622,7 +2622,7 @@ All Road = Усі дороги ######### simpleTerrain ########### # Requires translation! -Elevated = +Elevated = На висотах ######### Region Types ########### @@ -7016,4 +7016,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 1a25110fee..d19322f0f3 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.9.24" const val appName = "Unciv" - const val appCodeNumber = 1022 - const val appVersion = "4.12.10-patch1" + const val appCodeNumber = 1023 + const val appVersion = "4.12.11" const val gdxVersion = "1.12.1" const val ktorVersion = "2.3.12" diff --git a/changelog.md b/changelog.md index 4cd4fd3316..ae7e260e96 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,39 @@ +## 4.12.11 + +Resolved - icons in Wonder location "near city" for cities with same name as nations + +Resolved - Rome/Babylon capital takeover no longer renames like city state + +Resolved - Fixed air unit movement on map + +Resolved - Fixed Workboat construction automation ignoring existing workboat in city + +Resolved - Ouaz's lower-case 'clicking' + +Added searches for uniques and parameters + +Move from translated select box to regular one for unique builder + +Don't show deprecated uniques + +NOW WITH MODIFIERS + +Added unique builder screen, accessible from mod checker + +4.12.10-patch1 + +Fixed 'move to tile' when selecting tile outside of current movement range + +Overhaul of unique parameter type known values - + +By tuvus: +- Animations now show escort units +- Escort movement fix + +More Numbers Translations Coverage - By touhidurrr + +Correct the colors of the flag of Ukraine - By kostia1st + ## 4.12.10 UNIT MOVEMENT ANIMATION! diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 38dcba5c29..56930df198 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -481,7 +481,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.12.10-patch1", 1022) + val VERSION = Version("4.12.11", 1023) //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/1023.txt b/fastlane/metadata/android/en-US/changelogs/1023.txt new file mode 100644 index 0000000000..b74db9ad7b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1023.txt @@ -0,0 +1,35 @@ + + +Resolved - icons in Wonder location "near city" for cities with same name as nations + +Resolved - Rome/Babylon capital takeover no longer renames like city state + +Resolved - Fixed air unit movement on map + +Resolved - Fixed Workboat construction automation ignoring existing workboat in city + +Resolved - Ouaz's lower-case 'clicking' + +Added searches for uniques and parameters + +Move from translated select box to regular one for unique builder + +Don't show deprecated uniques + +NOW WITH MODIFIERS + +Added unique builder screen, accessible from mod checker + +4.12.10-patch1 + +Fixed 'move to tile' when selecting tile outside of current movement range + +Overhaul of unique parameter type known values - + +By tuvus: +- Animations now show escort units +- Escort movement fix + +More Numbers Translations Coverage - By touhidurrr + +Correct the colors of the flag of Ukraine - By kostia1st \ No newline at end of file