diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 138ad14fce..3da6e22fe4 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2361,19 +2361,12 @@ upon ending a turn in a [tileFilter] tile = en terminant un tour sur une case [t upon discovering a [tileFilter] tile = en découvrant une case [tileFilter] hidden from users = Caché aux joueurs Comment [comment] = [comment] - # Requires translation! Diplomatic relationships cannot change = Les relations diplomatiques ne peuvent pas changer - # Requires translation! Can convert gold to science with sliders = Possibilité de convertir l'Or en Science via un slider - # Requires translation! Allow City States to spawn with additional units = Autoriser la génération des Cités-États avec des unités additionnelles - # Requires translation! Can trade civilization introductions for [positiveAmount] Gold = Possibilité d'échanger la rencontre d'une civilisation pour [positiveAmount] Or - # Requires translation! Disable religion = Désactiver la religion - # Requires translation! Allow raze capital = Autorisation de raser les capitales - # Requires translation! Allow raze holy city = Autorisation de raser les villes saintes Mod is incompatible with [modFilter] = Le mod est incompatible avec [modFilter] Mod requires [modFilter] = Le mod nécessite [modFilter] diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 54814beb33..914bb83928 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2160,7 +2160,6 @@ Can be earned through combat = Bisa didapatkan melalui pertarungan Invisible to non-adjacent units = Tidak dapat dilihat oleh unit yang tidak bersebelahan Can see invisible [mapUnitFilter] units = Dapat melihat unit [mapUnitFilter] yang tidak kasat mata May upgrade to [unit] through ruins-like effects = Dapat meningkat menjadi [unit] melalui pengaruh reruntuhan kuno - # Requires translation! Can upgrade to [unit] = Bisa ditingkatkan ke [unit] Destroys tile improvements when attacking = Menghancurkan peningkatan daerah saat menyerang Cannot move = Tidak bisa bergerak @@ -2423,38 +2422,29 @@ Air = Udara ######### City filters ########### in all cities = di semua kota - # Requires translation! in your cities = di kotamu - # Requires translation! Your = Milikmu in all coastal cities = di semua kota pesisir Coastal = Pesisir in capital = di ibu kota - # Requires translation! Capital = Ibukota in all non-occupied cities = di semua kota yang tidak sedang diduduki - # Requires translation! Non-occupied = Tidak diduduki in all cities with a world wonder = di semua kota dengan keajaiban dunia in all cities connected to capital = di semua kota yang terkoneksi dengan ibu kota in all cities with a garrison = di semua kota bergarnisun - # Requires translation! Garrisoned = Ditempati garnisun in all cities in which the majority religion is a major religion = di semua kota di mana agama mayoritas adalah agama yang paling besar in all cities in which the majority religion is an enhanced religion = di semua kota di mana agama mayoritas adalah agama yang sudah diperkuat in non-enemy foreign cities = di kota-kota asing yang tidak sedang bermusuhan - # Requires translation! in enemy cities = di kota-kota musuh in foreign cities = di kota-kota asing Foreign = Asing in annexed cities = di kota-kota yang dicaplok - # Requires translation! Annexed = Dicaplok in puppeted cities = di kota-kota boneka - # Requires translation! Puppeted = Dijadikan boneka in holy cities = di kota-kota suci - # Requires translation! Holy = Suci in City-State cities = di kota-kota Negara-Kota in cities following this religion = di kota-kota yang mengikuti agama ini @@ -2474,7 +2464,6 @@ resource = sumber daya Foreign Land = Tanah Asing Friendly Land = Tanah Sekutu Enemy Land = Tanah Musuh - # Requires translation! your = milikmu Featureless = Tidak Berfitur Fresh Water = Air Tawar diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 68ae98bb4d..507b5b5452 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -2361,19 +2361,12 @@ upon ending a turn in a [tileFilter] tile = po zakończeniu tury na polu [tileFi upon discovering a [tileFilter] tile = po odkryciu pola [tileFilter] hidden from users = Ukryte przed graczami Comment [comment] = [comment] - # Requires translation! Diplomatic relationships cannot change = Relacje dyplomatyczne nie zmieniają się - # Requires translation! Can convert gold to science with sliders = Może zamieniać złoto na naukę suwakiem - # Requires translation! Allow City States to spawn with additional units = Wolne Miasta posiadają dodatkowe jednostki przy generowaniu - # Requires translation! Can trade civilization introductions for [positiveAmount] Gold = Może otrzymywać [positiveAmount] Złota za nawiązanie kontaktu - # Requires translation! Disable religion = Wyłącz religie - # Requires translation! Allow raze capital = Umożliwij burzenie stolicy - # Requires translation! Allow raze holy city = Umożliwij burzenie świętych miast Mod is incompatible with [modFilter] = Mod jest niekompatybilny z [modFilter] Mod requires [modFilter] = Mod wymaga [modFilter] diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 821d965689..42ce693009 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -783,7 +783,6 @@ Automated workers replace improvements = Los Trabajadores aut. Reemplazan Mejora Automated units move on turn start = Unidades Automatizadas se mueven al pricipio del Turno Automated units can upgrade = Unidades automatizadas se mejoran solas Automated units choose promotions = Unidades automatizadas escogen sus promociones - # Requires translation! Cities auto-bombard at end of turn = Ciudades bombardearán al finalizar el turno Order trade offers by amount = Ordenar ofertas comerciales por cantidad Ask for confirmation when pressing next turn = Confirmación al presionar "⏳Siguiente Turno" @@ -2051,7 +2050,6 @@ Can be purchased for [amount] [stat] [cityFilter] = Se puede comprar por [amount Limited to [amount] per Civilization = Limitado a [amount] por civilización Hidden until [amount] social policy branches have been completed = Oculto hasta que se hayan completado [amount] ramas políticas Only available = Solo disponible - # Requires translation! Unavailable = No disponible Excess Food converted to Production when under construction = El exceso de Comida es convertido en Producción mientras se construye Requires at least [amount] population = Requiere al menos [amount] de población @@ -2160,7 +2158,6 @@ Can be earned through combat = Puede obtenerse mediante el combate Invisible to non-adjacent units = Invisible para unidades no-adyacentes Can see invisible [mapUnitFilter] units = Puede ver unidades [mapUnitFilter] invisibles May upgrade to [unit] through ruins-like effects = Puede mejorarse a [unit] a través de efectos de ruinas - # Requires translation! Can upgrade to [unit] = Puede mejorarse a [unit] Destroys tile improvements when attacking = Destruye mejoras de casilla al atacar Cannot move = No se puede mover @@ -2256,10 +2253,8 @@ before founding a religion = antes de Fundar una Religión after founding a religion = después de Fundar una Religión before enhancing a religion = antes de Realzar una Religión after enhancing a religion = después de Realzar una Religión - # Requires translation! after generating a Great Prophet = después de generar un Gran Profeta if [buildingFilter] is constructed = si [buildingFilter] está construido - # Requires translation! if [buildingFilter] is constructed by anybody = si alguien ha construido un/a [buildingFilter] with [resource] = con [resource] without [resource] = sin [resource] @@ -2268,15 +2263,10 @@ when below [amount] [stat/resource] = al tener menos de [amount] [stat/resource] when above [amount] [stat/resource] (modified by game speed) = al tener más de [amount] [stat/resource] (alterado por la velocidad del juego) when below [amount] [stat/resource] (modified by game speed) = al tener menos de [amount] [stat/resource] (alterado por la velocidad del juego) in this city = en esta ciudad - # Requires translation! in [cityFilter] cities = en ciudades [cityFilter] - # Requires translation! in cities connected to the capital = en ciudades conectadas a la capital - # Requires translation! in cities with a major religion = en ciudades con una religión mayoritaria - # Requires translation! in cities with an enhanced religion = en ciudades con una religión realzada - # Requires translation! in cities following our religion = en ciudades que sigan nuestra religión in cities with a [buildingFilter] = en ciudades con un/a [buildingFilter] in cities without a [buildingFilter] = en ciudades sin un/a [buildingFilter] @@ -2300,9 +2290,7 @@ 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] in [tileFilter] tiles = en casillas con [tileFilter] in tiles without [tileFilter] = en casillas sin [tileFilter] - # Requires translation! in tiles adjacent to [tileFilter] = en casillas junto a [tileFilter] - # Requires translation! in tiles not adjacent to [tileFilter] = en casillas no adyacentes a [tileFilter] within [amount] tiles of a [tileFilter] = en un radio de [amount] casillas de un/a [tileFilter] on water maps = en mapas de agua @@ -2373,19 +2361,12 @@ upon ending a turn in a [tileFilter] tile = al terminar turno en una casilla de upon discovering a [tileFilter] tile = al descubrir una casilla de [tileFilter] hidden from users = oculto al jugador Comment [comment] = Comentario: [comment] - # Requires translation! Diplomatic relationships cannot change = No se pueden cambiar las relaciones diplomáticas - # Requires translation! Can convert gold to science with sliders = Se puede convertir Oro a Ciencia con un deslizador - # Requires translation! Allow City States to spawn with additional units = Las Ciudades Estado pueden iniciar con unidades adicionales - # Requires translation! Can trade civilization introductions for [positiveAmount] Gold = Se puede comerciar introducciones a otras civilizaciones por [positiveAmount] Oro - # Requires translation! Disable religion = Religión desactivada - # Requires translation! Allow raze capital = Se puede arrasar capitales - # Requires translation! Allow raze holy city = Se puede arrasar ciudades santas Mod is incompatible with [modFilter] = Este mod es incompatible con [modFilter] Mod requires [modFilter] = El mod requiere [modFilter] @@ -2423,38 +2404,29 @@ Air = aéreas ######### City filters ########### in all cities = en cada ciudad - # Requires translation! in your cities = en tus ciudades - # Requires translation! Your = Tu in all coastal cities = en cada ciudad costera Coastal = Costera in capital = en la capital - # Requires translation! Capital = Capital in all non-occupied cities = en cada ciudad no ocupada - # Requires translation! Non-occupied = No ocupada in all cities with a world wonder = en cada ciudad con una maravilla mundial in all cities connected to capital = en cada ciudad conectada a la capital in all cities with a garrison = en cada ciudad con una guarnición - # Requires translation! Garrisoned = Guarnecida in all cities in which the majority religion is a major religion = en cada ciudad donde la religión mayoritaria sea una religión principal in all cities in which the majority religion is an enhanced religion = en cada ciudad donde la religión mayoritaria sea una religión realzada in non-enemy foreign cities = en ciudades extranjeras no enemigas - # Requires translation! in enemy cities = en ciudades enemigas in foreign cities = en ciudades extranjeras Foreign = Extranjera in annexed cities = en ciudades anexadas - # Requires translation! Annexed = Anexadas in puppeted cities = en ciudades titeretadas - # Requires translation! Puppeted = titeretadas in holy cities = en ciudades santas - # Requires translation! Holy = Santas in City-State cities = en Ciudades-Estado in cities following this religion = en ciudades siguiendo esta religión @@ -2474,7 +2446,6 @@ resource = recurso Foreign Land = Tierra Extranjera Friendly Land = Tierra Amiga Enemy Land = Tierra Enemiga - # Requires translation! your = tu Featureless = Monótono Fresh Water = Agua Dulce @@ -2605,7 +2576,6 @@ Next Turn = Siguiente Turno Next Turn Alternate = Siguiente Turno Alterno Empire Overview = Visión General Music Player = Reproductor de Música - # Requires translation! Developer Console = Consola de Desarrollador Empire Overview Trades = Visión General - Comercio Empire Overview Units = Visión General - Unidades @@ -2966,9 +2936,7 @@ It appears that you do have a reason for existing – to make this deal with me. Greetings. = Saludos. What do YOU want?! = ¡¿Qué es lo que TÚ deseas?! Ingenuity = Ingenio Mesopotámico - # Requires translation! May the gods bless you, great Nebuchadnezzar, ruler of ancient Babylon! Built 5000 years ago, Babylon emerged as an empire in 1800 BC, thanks to godlike Hammurabi, The Giver of Law. Falling under the Kassites assaults then the Assyrian domination, Babylon was reborn from its ashes, gaining back its independance, and became the beacon for Arts and Learning in the ancient world. O Nebuchadnezzar, after your death, Babylon quickly fell, conquered by the mighty Persians, and then by the Greeks, until the great city disappeared forever in 141 BC. = Que los dioses lo bendigan, gran Nabucodonosor, ¡gobernador de la antigua Babilonia! Hace 5000 años, se construyó Babilonia y surgió como imperio en el año 1800 aC, gracias al 'divino' Hammurabi, el Dador de la Ley. A pesar de caer por los asaltos de los Casitas y luego la conquista Asiria, Babilonia revivió de las cenizas, retomando su independencia, y se convirtió en un pilar de las Artes y la Enseñanza en el mundo antiguo.\nOh Nabucodonosor, Babilonia cayó estrepitosamente con tu muerte, conquistada por los Persas, y luego los Griegos, hasta que en 141 aC, la gran ciudad desapareció para siempre. - # Requires translation! Great Nebuchadnezzar, Babylon's glory still lives through you and your people. Will you create a spark to enlighten the world again? Will your new empire shine through the ages of history? = Gran Nabucodonosor, la gloria de Babilonia aún vive en tu gente y en ti. ¿Crearás la chispa que ilumine al mundo otra vez? ¿Puede tu nuevo imperio brillar en las eras de la historia? Babylon = Babilonia Akkad = Acadia @@ -3020,9 +2988,7 @@ My friend, does this seem reasonable to you? = Mi amigo, ¿te parece razonable? Greetings! = ¡Saludos! What? = ¿Qué? Hellenic League = La Liga Helénica - # Requires translation! Great King Alexander, leader of the mighty Greek nation, you are truly blessed by the gods. In 480 BC, quarrelsome city-states such as Athens, Sparta, Thebes, found a way to join their forces, allowing Greece to defeat the mighty Persia in the 5th century BC, both on land and sea. Following their example, you lead a Greek coalition and finally struck down the Persian Empire in 331 BC. You conquered almost all the known world, and from Europe to Africa to India, you built an empire unmatched by any before it. = Gran Rey Alejandro, líder de la imponente nación Griega, bendecida por el Olimpo. En el 480 aC, las numerosas belicosas ciudades-estado, como Atenas, Esparta y Tebas, hallaron la manera de unir sus fuerzas, permitiendo a los Griegos derrotar en mar y tierra a la poderosa Persia en el siglo 5º aC. Inspirándote en esto, lideraste una coalición Griega y finalmente destruyeron el Imperio Persa en el 331 aC. Conquistaste casi toda la tierra conocida por los Griegos, y desde Europa hasta la India, te formaste un imperio inigualado a cualquiera anterior. - # Requires translation! Megalexandros, son of Zeus, will you ride Bucephalas again, to gift the world with the brightness of the Greek culture? Will your new empire shine through the ages of history? = O Megalexandros, hijo de Zeus, ¿cabalgarás Bucéfalos de nuevo para brindarle al mundo el esplendor de la cultura Griega? ¿Brillará tu nuevo imperio por las eras de la historia? Athens = Atenas Sparta = Esparta @@ -3076,9 +3042,7 @@ My friend, do you think you can accept this request? = Mi amigo, ¿crees que pue How are you today? = ¿Cómo estás hoy? Oh. It's you? = Oh. ¿Eres tu? Art of War = El Arte de la Guerra - # Requires translation! Heaven itself bends before your beauty, Empress Wu Zetian, ruler of eternal China! You lead one of the oldest and greatest civilization of humanity. In your time, China stood at the forefront of science and technology, bringing the world such contributions as gunpowder, the printing press, and the world of Confucius, and this, long before the rest of the world was mature enough to make the same discoveries! = El cielo mismo se inclina ante tu belleza, Emperatriz Wu Zetian, ¡reina de la China eterna! Tú lideras a una de las civilizaciones más antiguas y grandiosas de la humanidad. En tus tiempos, China fue la pionera de las ciencias y la tecnología, trayendo al mundo grandes aportes como la pólvora, la prensa, y el mundo de Confucio, ¡y todo esto mucho antes de que el resto del mundo fuera lo suficientemente maduro para descubrirlo! - # Requires translation! Great Queen, can you make China prevail again, using your divine intelligence and beauty? China stands for greatness, and all its enemies will be dazzled soon enough! Will your new empire shine through the ages of history? = Gran Reina, ¿lograrás que China prevalezca, usando tu inteligencia y belleza? ¡China es la grandeza, y todas sus enemigas pronto caerán! ¿Puede tu nuevo imperio brillar a través de la historia? Beijing = Beijing Shanghai = Shanghái diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index f13fa3671c..f128ee0caf 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,15 +1,15 @@ Afrikaans = 8 Belarusian = 9 Bosnian = 3 -Brazilian_Portuguese = 99 +Brazilian_Portuguese = 100 Bulgarian = 43 -Catalan = 98 +Catalan = 99 Czech = 79 Dutch = 97 English = 0 Filipino = 89 Finnish = 38 -French = 99 +French = 100 German = 99 Greek = 14 Hungarian = 78 diff --git a/changelog.md b/changelog.md index 64beafda8f..cf9edb0201 100644 --- a/changelog.md +++ b/changelog.md @@ -2,15 +2,11 @@ Allow city filters to be multifilters and not throw ruleset errors -Resolved - Korean science boost only applies for buildings *in capital* - -Further split between different road automations, some cleanup of the roadTo automation (but not enough, still pretty bad) - -Separated road automation to a separate file, but actually we have 2 completely different functions here, not sure if requires subdivision +Korean science boost only applies for buildings *in capital* By SeventhM: -- Avoid crash from city combantants -- Remove cache for nonstandard tile damage +- Avoid crash from city combantants with combatant conditional +- Split Strat Balance and Legend Start into their own checkboxes ThreatManager improvement - By tuvus diff --git a/core/src/com/unciv/logic/map/MapParameters.kt b/core/src/com/unciv/logic/map/MapParameters.kt index 8c03d66e85..8c3eb1e873 100644 --- a/core/src/com/unciv/logic/map/MapParameters.kt +++ b/core/src/com/unciv/logic/map/MapParameters.kt @@ -158,7 +158,9 @@ object MapResources { const val sparse = "Sparse" const val default = "Default" const val abundant = "Abundant" + @Deprecated("Since 4.10.7, moved to mapParameters") const val strategicBalance = "Strategic Balance" + @Deprecated("Since 4.10.7, moved to mapParameters") const val legendaryStart = "Legendary Start" } diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index a6f5ff6615..7a92caa76c 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -264,7 +264,6 @@ enum class UniqueParameterType( override fun isKnownValue(parameterText: String, ruleset: Ruleset): Boolean { if (parameterText in knownValues) return true - if (CityFilter.isKnownValue(parameterText, ruleset)) return true return false } diff --git a/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt index e6015f8476..b2f2c1e023 100644 --- a/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt @@ -330,7 +330,7 @@ class MapParametersTable( } private fun Table.addLegendaryStartCheckbox() { - legendaryStartCheckbox = "LegendaryStart".toCheckBox(mapParameters.legendaryStart) { + legendaryStartCheckbox = "Legendary Start".toCheckBox(mapParameters.legendaryStart) { mapParameters.legendaryStart = it } add(legendaryStartCheckbox).row() diff --git a/fastlane/metadata/android/en-US/changelogs/966.txt b/fastlane/metadata/android/en-US/changelogs/966.txt index ed85511d65..3abcd12424 100644 --- a/fastlane/metadata/android/en-US/changelogs/966.txt +++ b/fastlane/metadata/android/en-US/changelogs/966.txt @@ -1,15 +1,9 @@ - - Allow city filters to be multifilters and not throw ruleset errors -Resolved - Korean science boost only applies for buildings *in capital* - -Further split between different road automations, some cleanup of the roadTo automation (but not enough, still pretty bad) - -Separated road automation to a separate file, but actually we have 2 completely different functions here, not sure if requires subdivision +Korean science boost only applies for buildings *in capital* By SeventhM: -- Avoid crash from city combantants -- Remove cache for nonstandard tile damage +- Avoid crash from city combantants with combatant conditional +- Split Strat Balance and Legend Start into their own checkboxes ThreatManager improvement - By tuvus \ No newline at end of file