From 00c5ecb6a690585bca3d7682ac3540ffd16dd9e6 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 28 Feb 2022 22:49:11 +0200 Subject: [PATCH] 3.19.13 --- android/assets/jsons/translations/Czech.properties | 2 +- android/assets/jsons/translations/French.properties | 2 +- android/assets/jsons/translations/German.properties | 2 +- android/assets/jsons/translations/Indonesian.properties | 2 +- android/assets/jsons/translations/Italian.properties | 2 +- android/assets/jsons/translations/Korean.properties | 2 +- android/assets/jsons/translations/Russian.properties | 2 +- .../assets/jsons/translations/Simplified_Chinese.properties | 2 +- android/assets/jsons/translations/Spanish.properties | 2 +- android/assets/jsons/translations/Swedish.properties | 2 +- .../com/unciv/models/ruleset/unique/UniqueParameterType.kt | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index ce12437e21..033b78a8b5 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -4772,7 +4772,7 @@ Sabratha = Sabratha Rusadir = Rusadir Baecula = Baecula Saldae = Saldae -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Pozemní jednotky mohou překročit pole [tileFilter] jakmile je získán první [unit] +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Pozemní jednotky mohou překročit pole [terrainName] jakmile je získán první [baseUnitFilter] Units ending their turn on [tileFilter] tiles take [amount] damage = Jendotky končící tah na políčku [tileFilter] obdrží zranění [amount] Theodora = Theodora diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index d82ca97b94..502f68723f 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -4752,7 +4752,7 @@ Sabratha = Sabratha Rusadir = Russadir Baecula = Baecula Saldae = Saldae -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Les unités terrestres peuvent franchir les cases [tileFilter] après obtention du premier [unit] +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Les unités terrestres peuvent franchir les cases [terrainName] après obtention du premier [baseUnitFilter] Units ending their turn on [tileFilter] tiles take [amount] damage = Les unités finissant leur tour sur les cases [tileFilter] subissent [amount] dégâts Theodora = Théodora diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 8d21666b92..e178ce6976 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -4750,7 +4750,7 @@ Sabratha = Sabratha Rusadir = Rusadir Baecula = Baecula Saldae = Saldae -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Landeinheiten dürfen [tileFilter] Felder überqueren, nachdem die erste [unit] erworben wurde +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Landeinheiten dürfen [terrainName] Felder überqueren, nachdem die erste [baseUnitFilter] erworben wurde Units ending their turn on [tileFilter] tiles take [amount] damage = Einheiten, die ihren Zug auf [tileFilter] Feldern beenden, erleiden [amount] Schaden Theodora = Theodora diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 418d586542..d24fd3fb08 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -4750,7 +4750,7 @@ Sabratha = Sabratha Rusadir = Rusadir Baecula = Baecula Saldae = Saldae -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Unit darat dapat melewati daerah [tileFilter] setelah [unit] pertama didapatkan +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Unit darat dapat melewati daerah [terrainName] setelah [baseUnitFilter] pertama didapatkan Units ending their turn on [tileFilter] tiles take [amount] damage = Unit yang menyelesaikan gerakannya pada daerah [tileFilter] mendapatkan [amount] kerusakan Theodora = Theodora diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 032324ba6d..aa7b67aa10 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -4754,7 +4754,7 @@ Sabratha = Sabrata Rusadir = Rusadir Baecula = Becula Saldae = Saldae -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Le unità possono attraversare le [tileFilter] una volta quando ottieni per la prima volta [unit] +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Le unità possono attraversare le [terrainName] una volta quando ottieni per la prima volta [baseUnitFilter] Units ending their turn on [tileFilter] tiles take [amount] damage = Le unità che finiscono il loro turno su [tileFilter] subiscono [amount] danno Theodora = Teodora diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 645d47cc62..d9ec3d4092 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -4776,7 +4776,7 @@ Sabratha = 사브라타 Rusadir = 루사디르 Baecula = 베쿨라 Saldae = 살대 -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = 첫 [unit] 획득후 지상 유닛이 [tileFilter]에 출입 가능 +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = 첫 [baseUnitFilter] 획득후 지상 유닛이 [terrainName]에 출입 가능 Units ending their turn on [tileFilter] tiles take [amount] damage = [tileFilter]에서 턴을 마친 유닛에게 [amount] HP 피해 Theodora = 테오도라 diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index df9191a3a9..e22de75d58 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -4775,7 +4775,7 @@ Sabratha = Сабрата Rusadir = Русадир Baecula = Бекула Saldae = Сальды -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Сухопутные юниты могут пересекать клетки [tileFilter] после того, как появился первый [unit] +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Сухопутные юниты могут пересекать клетки [terrainName] после того, как появился первый [baseUnitFilter] Units ending their turn on [tileFilter] tiles take [amount] damage = Юниты, закончившие свой ход на клетках [tileFilter], получают [amount] урона Theodora = Феодора diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 8e5ce439a3..946c0aa0ef 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -4773,7 +4773,7 @@ Sabratha = 萨布拉塔 Rusadir = 鲁萨迪尔 Baecula = 贝库拉 Saldae = 萨尔达伊 -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = 获得第一个[unit]以后，陆地单位能穿过[tileFilter]地块 +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = 获得第一个[baseUnitFilter]以后，陆地单位能穿过[terrainName]地块 Units ending their turn on [tileFilter] tiles take [amount] damage = 在[tileFilter]上结束回合的单位将受到[amount]伤害 Theodora = 狄奥多拉 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 2a69c22850..1b8560007e 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -4750,7 +4750,7 @@ Sabratha = Sabratha Rusadir = Rusadir Baecula = Baecula Saldae = Saldae -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Unidades terrestres pueden cruzar casillas [tileFilter] después de obtenér el primer [unit] +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Unidades terrestres pueden cruzar casillas [terrainName] después de obtenér el primer [baseUnitFilter] Units ending their turn on [tileFilter] tiles take [amount] damage = Las unidades que finalizen turno en casillas [tileFilter] tomarán [amount] daño Theodora = Teodora diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 68d3c66f4f..d1049e1674 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -4799,7 +4799,7 @@ Sabratha = Sabratha Rusadir = Rusadir Baecula = Baikula Saldae = Saldai -Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Landenheter kan gå igenom [tileFilter]-rutor efter att den första [unit] tjänats in +Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = Landenheter kan gå igenom [terrainName]-rutor efter att den första [baseUnitFilter] tjänats in Units ending their turn on [tileFilter] tiles take [amount] damage = Enheter som slutar sitt drag på [tileFilter]-rutor tar [amount] skada Theodora = Theodora diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index 4d60221940..c0561dd27a 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -11,7 +11,7 @@ import com.unciv.models.stats.Stat // parameterName values should be compliant with autogenerated values in TranslationFileWriter.generateStringsFromJSONs // Eventually we'll merge the translation generation to take this as the source of that @Suppress("unused") // Some are used only via enumerating the enum matching on parameterName -enum class UniqueParameterType(val parameterName:String) { +enum class UniqueParameterType(var parameterName:String) { Number("amount") { override fun getErrorSeverity(parameterText: String, ruleset: Ruleset): UniqueType.UniqueComplianceErrorSeverity? { @@ -369,7 +369,7 @@ enum class UniqueParameterType(val parameterName:String) { "in cities following this religion", ) - fun safeValueOf(param: String) = values().firstOrNull { it.parameterName == param } ?: Unknown + fun safeValueOf(param: String) = values().firstOrNull { it.parameterName == param } ?: Unknown.apply { this.parameterName = param } } }