AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken translations

Browse Source
This commit is contained in:
yairm210 2021-10-06 19:06:53 +03:00
parent 2b75124081
commit 5e8e23fb43
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/translations/German.properties
View File

@ -4279,7 +4279,7 @@ Krakatoa = Krakatau
Neighboring tiles will convert to [baseTerrain] = Benachbarte Felder werden in [baseTerrain] umgewandelt
Rock of Gibraltar = Felsen von Gibraltar
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Benachbarte Felder, außer [param2], werden in [param] umgewandelt
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Benachbarte Felder, außer [baseTerrain2], werden in [baseTerrain] umgewandelt
Cerro de Potosi = Cerro de Potosí

2
android/assets/jsons/translations/Indonesian.properties
View File

@ -4279,7 +4279,7 @@ Krakatoa = Krakatau
Neighboring tiles will convert to [baseTerrain] = Daerah yang bersebelahan akan berubah menjadi [baseTerrain]
Rock of Gibraltar = Batu Gibraltar
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Daerah yang bersebelahan kecuali [param] akan berubah menjadi [param2]
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Daerah yang bersebelahan kecuali [baseTerrain] akan berubah menjadi [baseTerrain2]
Cerro de Potosi = Cerro de Potosi

2
android/assets/jsons/translations/Italian.properties
View File

@ -4281,7 +4281,7 @@ Krakatoa = Krakatoa
Neighboring tiles will convert to [baseTerrain] = Le caselle vicine si convertiranno a [baseTerrain]
Rock of Gibraltar = Rocca di Gibilterra
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Le caselle vicine tranne [param2] si convertiranno a [param]
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Le caselle vicine tranne [baseTerrain2] si convertiranno a [baseTerrain]
Cerro de Potosi = Cerro Rico de Potosí

2
android/assets/jsons/translations/Simplified_Chinese.properties
View File

@ -4328,7 +4328,7 @@ Krakatoa = 喀拉喀托火山
Neighboring tiles will convert to [baseTerrain] = 相邻地块将转化为[baseTerrain]
Rock of Gibraltar = 直布罗陀巨岩
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = 相邻地块除了[param]将会转化为[param2]
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = 相邻地块除了[baseTerrain]将会转化为[baseTerrain2]
Cerro de Potosi = 富饶山

2
android/assets/jsons/translations/Spanish.properties
View File

@ -4378,7 +4378,7 @@ Krakatoa = Krakatoa
Neighboring tiles will convert to [baseTerrain] = Casillas contiguas se convertirán en [baseTerrain]
Rock of Gibraltar = Peñón de Gibraltar
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Casillas contiguas excepto [param2] se convertirán en [param]
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Casillas contiguas excepto [baseTerrain2] se convertirán en [baseTerrain]
Cerro de Potosi = Cerro de Potosi

2
android/assets/jsons/translations/Swedish.properties
View File

@ -4279,7 +4279,7 @@ Krakatoa = Krakatoa
Neighboring tiles will convert to [baseTerrain] = Angränsande rutor omvandlas till [baseTerrain]
Rock of Gibraltar = Gibraltarklippan
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Angränsande rutor utom [param2] omvandlas till [param]
Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Angränsande rutor utom [baseTerrain2] omvandlas till [baseTerrain]
Cerro de Potosi = Cerro de Potosi

5
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -579,12 +579,13 @@ class Ruleset {
checkUniques(reward, lines, UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific)
}
for (promotion in unitPromotions.values) {
// These are warning as of 3.17.5 to not break existing mods and give them time to correct, should be upgraded to error in the future
for (prereq in promotion.prerequisites)
if (!unitPromotions.containsKey(prereq))
lines += "${promotion.name} requires promotion $prereq which does not exist!"
lines.add("${promotion.name} requires promotion $prereq which does not exist!", RulesetErrorSeverity.Warning)
for (unitType in promotion.unitTypes)
if (!unitTypes.containsKey(unitType) && (unitTypes.isNotEmpty() || !baseRuleset.unitTypes.containsKey(unitType)))
lines += "${promotion.name} references unit type ${unitType}, which does not exist!"
lines.add("${promotion.name} references unit type ${unitType}, which does not exist!", RulesetErrorSeverity.Warning)
checkUniques(promotion, lines, UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific)
}
for (unitType in unitTypes.values) {

4
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -132,9 +132,9 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget) {
StrengthPlus("+[amount]% Strength", UniqueTarget.Unit),
@Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength"), DeprecationLevel.WARNING)
StrengthMin("-[amount]% Strength", UniqueTarget.Unit),
@Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength <vs [mapUnitFilter] units> OR [amount]% Strength <vs cities>"), DeprecationLevel.WARNING)
@Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength <vs [mapUnitFilter] units>/<vs cities>"), DeprecationLevel.WARNING)
StrengthPlusVs("+[amount]% Strength vs [combatantFilter]", UniqueTarget.Unit),
@Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength <vs [mapUnitFilter] units> OR [amount]% Strength <vs cities>"), DeprecationLevel.WARNING)
@Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength <vs [mapUnitFilter] units>/<vs cities>"), DeprecationLevel.WARNING)
StrengthMinVs("-[amount]% Strength vs [combatantFilter]", UniqueTarget.Unit),
@Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength"), DeprecationLevel.WARNING)
CombatBonus("+[amount]% Combat Strength", UniqueTarget.Unit),