diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 38f8868289..f1b3c1a883 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -299,10 +299,8 @@ Non-existent city = Cidade inexistente Lost ability = Habilidade perdida National ability = Habilidade nacional [firstValue] vs [secondValue] = [firstValue] vs [secondValue] - # Requires translation! -Gained = - # Requires translation! -Lost = +Gained = Ganhou +Lost = Perdido # New game screen @@ -516,22 +514,14 @@ River generation failed! = A geração do rio falhou! Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = Por favor, não use a terra 'Landmass' com o tipo de mapa 'Vazio', crie um novo mapa vazio. This map has errors: = Esse mapa tem erros: The incompatible elements have been removed. = Os elementos incompatíveis foram removidos. - # Requires translation! -Current map: World Wrap = - # Requires translation! -Overlay image = - # Requires translation! -Click to choose a file = - # Requires translation! -Choose an image = - # Requires translation! -Overlay transparency: = - # Requires translation! -Invalid overlay image = - # Requires translation! -World wrap is incompatible with an overlay and was deactivated. = - # Requires translation! -An overlay image is incompatible with world wrap and was deactivated. = +Current map: World Wrap = Mapa atual: Envoltório Mundial +Overlay image = Imagem de sobreposição +Click to choose a file = Clique para escolher um arquivo +Choose an image = Escolha uma imagem +Overlay transparency: = Transparência de sobreposição: +Invalid overlay image = Imagem de sobreposição inválida +World wrap is incompatible with an overlay and was deactivated. = Envoltório mundial é incompatível com uma sobreposição e foi desativado. +An overlay image is incompatible with world wrap and was deactivated. = Uma imagem de sobreposição é incompatível com a quebra do mundo e foi desativada. ## Map/Tool names My new map = Meu novo mapa @@ -1231,10 +1221,8 @@ Please select a tile for this building's [improvement] = Por favor, selecione um Invalid input! Please enter a different string. = Entrada inválida! Por favor coloque uma string diferente. Invalid input! Please enter a valid number. = Entrada inválida! Por favor insira um número válido. Please enter some text = Por favor coloque algum texto - # Requires translation! -Please enter a file name = - # Requires translation! -File name: = +Please enter a file name = Insira um nome de arquivo +File name: = Nome do arquivo: # Technology UI diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 8aca02c9f7..7ebbb38634 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -300,9 +300,9 @@ Lost ability = Habilidad perdida National ability = Habilidad nacional [firstValue] vs [secondValue] = [firstValue] vs. [secondValue] # Requires translation! -Gained = +Gained = Ganado # Requires translation! -Lost = +Lost = Perdido # New game screen @@ -517,21 +517,21 @@ Please don't use step 'Landmass' with map type 'Empty', create a new empty map i This map has errors: = Este mapa tiene errores: The incompatible elements have been removed. = Los elementos incompatibles han sido removidos. # Requires translation! -Current map: World Wrap = +Current map: World Wrap = Mapa actual: Mapa Envolvente # Requires translation! -Overlay image = +Overlay image = Imagen superpuesta # Requires translation! -Click to choose a file = +Click to choose a file = Toca para seleccionar un archivo # Requires translation! -Choose an image = +Choose an image = Escoge una imagen # Requires translation! -Overlay transparency: = +Overlay transparency: = Transparencia de la imagen: # Requires translation! -Invalid overlay image = +Invalid overlay image = Imagen inválida para superponer # Requires translation! -World wrap is incompatible with an overlay and was deactivated. = +World wrap is incompatible with an overlay and was deactivated. = El Mapa Envolvente es incompatible con una imagen superpuesta, y ha sido DESACTIVADO # Requires translation! -An overlay image is incompatible with world wrap and was deactivated. = +An overlay image is incompatible with world wrap and was deactivated. = Una imagen superpuesta es incompatible con Mapa Envolvente y ha sido DESACTIVADA ## Map/Tool names My new map = Mi mapa nuevo @@ -794,6 +794,7 @@ Currently playing: [title] = Reproduciendo actualmente: [title] Download music = Descargar música Downloading... = Descargando... Could not download music! = ¡No se pudo descargar la música! +Update Mod categories = Actualizar las categorias de Mods ## Advanced tab Advanced = Avanzado @@ -1232,9 +1233,9 @@ Invalid input! Please enter a different string. = ¡Entrada inválida! Por favor Invalid input! Please enter a valid number. = ¡Entrada inválida! Por favor, digite un número válido. Please enter some text = Por favor, introduzca algún texto # Requires translation! -Please enter a file name = +Please enter a file name = Por favor introduzca un nombre de archivo # Requires translation! -File name: = +File name: = Nombre del archivo: # Technology UI @@ -1731,6 +1732,7 @@ Maps = Mapas Fun = Juerga Mods of mods = Mod de Mod Mod info and options = Información de mods y opciones +Sorting and filtering needs to wait until the online query finishes = Hay que esperar a que la busqueda en linea termine para ordenar y filtrar Next page = Siguiente página Open Github page = Abrir página de Github Permanent audiovisual mod = Mod audiovisual permanente diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 80bbf1815e..36f5c84113 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 = 876 - const val appVersion = "4.6.18-patch1" + const val appCodeNumber = 877 + const val appVersion = "4.6.19" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 674a924edb..ac0578f4c1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,35 @@ +## 4.6.19 + +chore: Android Gradle Plugin upgrade (7.3.1 -> 7.4.2) + +Resolved - Transform uniques accept conditionals correctly + +bugfix: AI evaluation of ButItemsDiscount no longer crashes + +Resolves - double movement unique accepts conditionals + +"before adopting / after adopting" uniques accept belief as well as policy - + +'random generated map type' is actually random + +Resolved - only display first 5 missing mods + +4.6.18-patch1 + +Revert "Mod checks against sellable, missing or multiple Palace(s) " + +By WhoIsJohannes: +- Show line color in more cases +- Only consider attackable enemies within visible tiles. + +By SomeTroglodyte: +- Fix translated sorting +- Refactor input-related components into own package +- Only *display* first 5 missing mods but auto-download all +- Fix and unit-test Hakkapeliitta TransferMovement ability + +Pantheon Mod Constants - By SeventhM + ## 4.6.18 Pillaged improvements have a visual indication on the icon diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 5c57392593..a4a1142073 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -531,7 +531,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.6.18-patch1", 876) + val VERSION = Version("4.6.19", 877) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/877.txt b/fastlane/metadata/android/en-US/changelogs/877.txt new file mode 100644 index 0000000000..ddeb1e9dde --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/877.txt @@ -0,0 +1,31 @@ + + +chore: Android Gradle Plugin upgrade (7.3.1 -> 7.4.2) + +Resolved - Transform uniques accept conditionals correctly + +bugfix: AI evaluation of ButItemsDiscount no longer crashes + +Resolves - double movement unique accepts conditionals + +"before adopting / after adopting" uniques accept belief as well as policy - + +'random generated map type' is actually random + +Resolved - only display first 5 missing mods + +4.6.18-patch1 + +Revert "Mod checks against sellable, missing or multiple Palace(s) " + +By WhoIsJohannes: +- Show line color in more cases +- Only consider attackable enemies within visible tiles. + +By SomeTroglodyte: +- Fix translated sorting +- Refactor input-related components into own package +- Only *display* first 5 missing mods but auto-download all +- Fix and unit-test Hakkapeliitta TransferMovement ability + +Pantheon Mod Constants - By SeventhM \ No newline at end of file