diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index b195f9401c..f8d10835cc 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -99,10 +99,8 @@ Requires at least one of the following: = Precisa pelo menos de um dos seguintes Requires all of the following: = Precisa de todos os seguintes Leads to [techName] = Leva a [techName] Leads to: = Leva a - # Requires translation! -Enables: = - # Requires translation! -Disables: = +Enables: = Habilita: +Disables: = Desativa: Current construction = Construção atual Construction queue = Fila de construção @@ -2242,8 +2240,7 @@ You have denounced our enemies = Você condenou nossos inimigos Our open borders have brought us closer together. = Nossa fronteiras abertas nos fizeram mais próximos. You fulfilled your promise to stop settling cities near us! = Você cumpriu sua promessa de não povoar cidades perto de nós! You gave us units! = Você nos deu unidades! - # Requires translation! -We appreciate your gifts = +We appreciate your gifts = Nós apreciamos seus presentes You returned captured units to us = Você retornou uma unidade capturada para nós #################### Lines from Buildings from Civ V - Vanilla #################### diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index e326de8cda..a30f502293 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -100,9 +100,9 @@ Requires all of the following: = Tous les éléments suivants sont requis : Leads to [techName] = Conduit à [techName] Leads to: = Conduit à : # Requires translation! -Enables: = +Enables: = Active : # Requires translation! -Disables: = +Disables: = Désactive : Current construction = Construction en cours Construction queue = File de construction diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 8c839cc4f5..1a196a468f 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -102,10 +102,8 @@ Requires at least one of the following: = Richiede almeno uno dei seguenti: Requires all of the following: = Richiede tutti i seguenti: Leads to [techName] = Conduce a [techName] Leads to: = Conduce a: - # Requires translation! -Enables: = - # Requires translation! -Disables: = +Enables: = Abilita: +Disables: = Disabilita: Current construction = Produzione attuale Construction queue = Coda di produzione diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 538b3d81fb..84ae3e8839 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -43,7 +43,7 @@ Pass a turn!\nCycle through units with 'Next unit' > Click 'Next turn' = ¡Pasa Reassign worked tiles!\nEnter city screen > click the assigned (green) tile to unassign > \n click an unassigned tile to assign population = ¡Reasigna las casillas trabajadas!\nEntra en la pantalla de ciudad > haz clic en la casilla asignada (en verde) para desasignarla > \n haz clic en una casilla desasignada para asignarla población Meet another civilization!\nExplore the map until you encounter another civilization! = ¡Conoce a otra civilización!\n¡Explora el mapa hasta que te encuentres con otra civilización! Open the options table!\nClick the menu button (top left) > click 'Options' = ¡Abre el menú de opciones!\nHaz clic en el botón del menú (arriba a la izquierda) > Haz clic en "Opciones" -Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Click 'Construct improvement' (above the unit table, bottom left)\n > Choose the farm > \n Leave the worker there until it's finished = ¡Construye una mejora!\nConstruye un Trabajador > Muévelo a una casilla de Llanura o de Pradera > \n Haz clic en "Construir mejora" (sobre la tabla de la unidad, abajo a la izquierda)\n > Selecciona la granja > \n Deja el trabajador ahí hasta que esté terminada +Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Click 'Construct improvement' (above the unit table, bottom left)\n > Choose the farm > \n Leave the worker there until it's finished = ¡Construye una mejora!\nConstruye un Trabajador > Muévelo a una casilla de Sabana o de Pradera > \n Haz clic en "Construir mejora" (sobre la tabla de la unidad, abajo a la izquierda)\n > Selecciona la granja > \n Deja el trabajador ahí hasta que esté terminada Create a trade route!\nConstruct roads between your capital and another city\nOr, automate your worker and let him get to that eventually = ¡Crea una ruta comercial!\nConstruye carreteras entre tu capital y otra ciudad\nO pon tus trabajadores en automático y se pondrán a ello cuando sea Conquer a city!\nBring an enemy city down to low health > \nEnter the city with a melee unit = ¡Conquista una ciudad!\nDeja una ciudad enemiga con poca salud > \nEntra en la ciudad con una unidad cuerpo a cuerpo Move an air unit!\nSelect an air unit > select another city within range > \nMove the unit to the other city = ¡Mueve una unidad aérea!\nSelecciona una unidad aérea > selecciona otra ciudad que esté al alcance > \nMueve la unidad a la otra ciudad @@ -100,9 +100,9 @@ Requires all of the following: = Requiere todo lo siguiente: Leads to [techName] = Lleva a [techName] Leads to: = Lleva a: # Requires translation! -Enables: = +Enables: = Activa: # Requires translation! -Disables: = +Disables: = Desactiva: Current construction = Construcción actual Construction queue = Lista de construcción @@ -1697,7 +1697,7 @@ ConditionalsPlacement = after [stats] in cities on [terrainFilter] tiles = [stats] en ciudades en casillas [terrainFilter] [stats] from all [buildingFilter] buildings = [stats] de todos los edificios [buildingFilter] [stats] from [tileFilter] tiles [cityFilter] = [stats] de casillas de [tileFilter] [cityFilter] -[stats] from [tileFilter] tiles without [tileFilter2] [cityFilter] = [stats] de casillas [tileFilter] sin [tileFilter2] [cityFilter] +[stats] from [tileFilter] tiles without [tileFilter2] [cityFilter] = [stats] de casillas con [tileFilter] sin [tileFilter2] [cityFilter] [stats] from each Trade Route = [stats] de cada Ruta Comercial [stats] for each global city following this religion = [stats] por cada ciudad mundial siguiendo esta religión [stats] from every [amount] global followers [cityFilter] = [stats] de cada [amount] seguidores globales [cityFilter] @@ -1961,11 +1961,11 @@ Rare feature = Característica rara [amount]% Chance to be destroyed by nukes = [amount]% Probabilidad de ser destruído por explosión nuclear Fresh water = Agua Dulce Rough terrain = Terreno Abrupto -Deposits in [tileFilter] tiles always provide [amount] resources = Depósitos en casillas [tileFilter] siempre brindan [amount] recursos +Deposits in [tileFilter] tiles always provide [amount] resources = Depósitos en casillas de [tileFilter] siempre brindan [amount] recursos Can only be created by Mercantile City-States = Solo puede ser creado por Ciudades-Estados Mercantiles Guaranteed with Strategic Balance resource option = Garantizado con la opción de recurso Equilibrado Estratégico Can also be built on tiles adjacent to fresh water = También se puede construir sobre casillas adyacentes al agua dulce. -[stats] from [tileFilter] tiles = [stats] de casillas [tileFilter] +[stats] from [tileFilter] tiles = [stats] de casillas con [tileFilter] Can be built outside your borders = Puede construirse fuera de tus fronteras Can be built just outside your borders = Se puede construir justo fuera de tus fronteras Can only be built to improve a resource = Sólo se puede construír para mejorar un recurso @@ -2020,16 +2020,16 @@ vs [mapUnitFilter] units = vs unidades [mapUnitFilter] when fighting units from a Civilization with more Cities than you = cuando luches contra unidades de una Civilización con más Ciudades que tú when attacking = al atacar when defending = al defender -when fighting in [tileFilter] tiles = al pelear en casillas [tileFilter] +when fighting in [tileFilter] tiles = al pelear en casillas de [tileFilter] on foreign continents = en continentes extranjeros when adjacent to a [mapUnitFilter] unit = cuando está adyacente a una unidad [mapUnitFilter] when above [amount] HP = cuando está por encima de [amount] HP when below [amount] HP = cuando está por debajo de [amount] HP if it hasn't used other actions yet = si no se han usado otras acciones with [amount] to [amount2] neighboring [tileFilter] tiles = con [amount] a [amount2] casillas al lado de [tileFilter] -with [amount] to [amount2] neighboring [tileFilter] [tileFilter2] tiles = con [amount] a [amount2] casillas [tileFilter] [tileFilter2] adyacentes -in [tileFilter] tiles = en casillas [tileFilter] -in [tileFilter] [tileFilter2] tiles = en casillas [tileFilter] [tileFilter2] +with [amount] to [amount2] neighboring [tileFilter] [tileFilter2] tiles = con [amount] a [amount2] casillas de [tileFilter] [tileFilter2] adyacentes +in [tileFilter] tiles = en casillas con [tileFilter] +in [tileFilter] [tileFilter2] tiles = en casillas con [tileFilter] [tileFilter2] in tiles without [tileFilter] = en casillas sin [tileFilter] within [amount] tiles of a [tileFilter] = en un radio de [amount] casillas de un/a [tileFilter] on water maps = en mapas de agua @@ -2144,7 +2144,7 @@ Friendly Land = Tierra Amiga Enemy Land = Tierra Enemiga Featureless = Monótono Fresh Water = Agua Dulce -non-fresh water = agua no dulce +non-fresh water = Sin Agua Dulce Natural Wonder = Maravilla Natural Impassable = Infranqueable Luxury resource = Recurso de Lujo @@ -2154,7 +2154,7 @@ Bonus resource = Recurso Bonus ######### Tile Filters ########### unimproved = no mejorado -All Road = Todas las Carreteras +All Road = Todas las Vías ######### Region Types ########### @@ -2243,7 +2243,7 @@ Our open borders have brought us closer together. = Nuestras fronteras abiertas You fulfilled your promise to stop settling cities near us! = ¡Has cumplido tu promesa de no fundar ciudades cerca nuestro! You gave us units! = ¡Nos regalaste unidades! # Requires translation! -We appreciate your gifts = +We appreciate your gifts = Agradecemos sus regalos You returned captured units to us = Nos has devuelto unidades capturadas #################### Lines from Buildings from Civ V - Vanilla #################### @@ -4251,15 +4251,15 @@ Coast = Costa Grassland = Pradera -Plains = Llanura +Plains = Sabana Tundra = Tundra Desert = Desierto -Lakes = Lagos +Lakes = Lago -Mountain = Montañas +Mountain = Montaña Snow = Nieve @@ -4273,11 +4273,11 @@ Jungle = Selva Marsh = Pantano Only Polders can be built here = Solo Pólderos pueden ser construidos aquí -Fallout = Terreno radioactivo +Fallout = Terreno Radioactivo Oasis = Oasis -Flood plains = Terreno inundable +Flood plains = Marisma Ice = Hielo @@ -4631,7 +4631,7 @@ Haka War Dance = Danza de Guerra Haka Rejuvenation = Rejuvenecimiento -Slinger Withdraw = Retirar Hondero +Slinger Withdraw = Retirada Ignore terrain cost = Ignora costo del terreno @@ -5603,7 +5603,7 @@ Sabratha = Sabratha Rusadir = Rusadir Baecula = Baecula Saldae = Saldae -Units ending their turn on [tileFilter] tiles take [amount] damage = Las unidades que finalizen turno en casillas [tileFilter] tomarán [amount] daño +Units ending their turn on [tileFilter] tiles take [amount] damage = Las unidades que finalizen turno en casillas de [tileFilter] tomarán [amount] daño Theodora = Teodora It is always a shame to destroy a thing of beauty. Happily, you are not one. = Siempre es una vergüenza destruir una cosa bella. Felizmente, usted no es uno. diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 077e182590..b00f1e66a5 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.0" const val appName = "Unciv" - const val appCodeNumber = 817 - const val appVersion = "4.4.18" + const val appCodeNumber = 818 + const val appVersion = "4.4.19" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 209473d8e8..8e730cebcd 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,25 @@ +## 4.4.19 + +chore: code cleanup + +Fix unique parameter type + +modding: Added "upon gaining a [unitFilter] unit" trigger condition + +chore: moved citiesConnectedToCapitalToMediums to cache + +By Gualdimar: +- Limit camera movement within explored region +- Fixed world wrap coordinates check + +Android: use best possible device frame rate - By vegeta1k95 + +Allow filters in the ModOptions "ToRemove" lists - By SomeTroglodyte + +Play city-state music if available - By Skekdog + +Add 'neutral' Flood plains - By Caballero-Arepa + ## 4.4.18 By vegeta1k95: diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 8cd83f04f8..24d157e675 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -542,7 +542,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.4.18", 817) + val VERSION = Version("4.4.19", 818) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/818.txt b/fastlane/metadata/android/en-US/changelogs/818.txt new file mode 100644 index 0000000000..7e4ab6c3de --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/818.txt @@ -0,0 +1,21 @@ + + +chore: code cleanup + +Fix unique parameter type + +modding: Added "upon gaining a [unitFilter] unit" trigger condition + +chore: moved citiesConnectedToCapitalToMediums to cache + +By Gualdimar: +- Limit camera movement within explored region +- Fixed world wrap coordinates check + +Android: use best possible device frame rate - By vegeta1k95 + +Allow filters in the ModOptions "ToRemove" lists - By SomeTroglodyte + +Play city-state music if available - By Skekdog + +Add 'neutral' Flood plains - By Caballero-Arepa \ No newline at end of file