From 98f14523ed5d2f84a758cb7a3656671239cb13f8 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Wed, 22 Sep 2021 19:47:31 +0300 Subject: [PATCH] Add all cityFilter strings from the 'source of truth', since many were missing from translation file --- .../Brazilian_Portuguese.properties | 48 ++++++++++------ .../jsons/translations/Bulgarian.properties | 56 ++++++++++++------- .../jsons/translations/Czech.properties | 40 +++++++++---- .../jsons/translations/Dutch.properties | 40 +++++++++---- .../jsons/translations/English.properties | 56 ++++++++++++------- .../jsons/translations/Finnish.properties | 56 ++++++++++++------- .../jsons/translations/French.properties | 42 +++++++++----- .../jsons/translations/German.properties | 40 +++++++++---- .../jsons/translations/Greek.properties | 42 +++++++++----- .../jsons/translations/Hungarian.properties | 46 ++++++++++----- .../jsons/translations/Indonesian.properties | 40 +++++++++---- .../jsons/translations/Italian.properties | 40 +++++++++---- .../jsons/translations/Japanese.properties | 42 +++++++++----- .../jsons/translations/Korean.properties | 40 +++++++++---- .../jsons/translations/Lithuanian.properties | 56 ++++++++++++------- .../jsons/translations/Malay.properties | 56 ++++++++++++------- .../Persian_(Pinglish-DIN).properties | 56 ++++++++++++------- .../Persian_(Pinglish-UN).properties | 56 ++++++++++++------- .../jsons/translations/Polish.properties | 42 +++++++++----- .../jsons/translations/Portuguese.properties | 40 +++++++++---- .../jsons/translations/Romanian.properties | 56 ++++++++++++------- .../jsons/translations/Russian.properties | 40 +++++++++---- .../Simplified_Chinese.properties | 40 +++++++++---- .../jsons/translations/Spanish.properties | 40 +++++++++---- .../jsons/translations/Swedish.properties | 40 +++++++++---- .../Traditional_Chinese.properties | 42 +++++++++----- .../jsons/translations/Turkish.properties | 40 +++++++++---- .../jsons/translations/Ukrainian.properties | 40 +++++++++---- .../completionPercentages.properties | 4 +- .../jsons/translations/template.properties | 12 +--- core/src/com/unciv/logic/city/CityInfo.kt | 1 + .../ruleset/unique/UniqueParameterType.kt | 4 +- .../translations/TranslationFileWriter.kt | 5 +- 33 files changed, 870 insertions(+), 428 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 568aa0f962..1f20f202ac 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1544,20 +1544,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = nesta cidade -in all cities = em todas as cidades -in all coastal cities = Em toda cidade na costa -in capital = na capital - # Requires translation! -in all non-occupied cities = - # Requires translation! -in all cities with a world wonder = - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -1630,8 +1616,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1641,6 +1626,37 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = nesta cidade +in all cities = em todas as cidades +in all coastal cities = Em toda cidade na costa +in capital = na capital + # Requires translation! +in all non-occupied cities = + # Requires translation! +in all cities with a world wonder = + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index 887bdaf1af..de65287841 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -1568,24 +1568,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters - # Requires translation! -in this city = - # Requires translation! -in all cities = - # Requires translation! -in all coastal cities = - # Requires translation! -in capital = - # Requires translation! -in all non-occupied cities = - # Requires translation! -in all cities with a world wonder = - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -1667,8 +1649,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1678,6 +1659,41 @@ ConditionalsPlacement = +######### City filters ########### + + # Requires translation! +in this city = + # Requires translation! +in all cities = + # Requires translation! +in all coastal cities = + # Requires translation! +in capital = + # Requires translation! +in all non-occupied cities = + # Requires translation! +in all cities with a world wonder = + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 64c15b601a..5b1ad7d334 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -1307,16 +1307,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = v tomto městě -in all cities = ve všech městech -in all coastal cities = ve všech pobřežních městech -in capital = v hlavním městě -in all non-occupied cities = ve všech nehlídaných městech -in all cities with a world wonder = ve všech městech s divem -in all cities connected to capital = ve všech městech spojených s hlavním městem -in all cities with a garrison = ve všech městech s posádkou - # Uniques that are relevant to more than one type of game object @@ -1381,8 +1371,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1392,6 +1381,33 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = v tomto městě +in all cities = ve všech městech +in all coastal cities = ve všech pobřežních městech +in capital = v hlavním městě +in all non-occupied cities = ve všech nehlídaných městech +in all cities with a world wonder = ve všech městech s divem +in all cities connected to capital = ve všech městech spojených s hlavním městem +in all cities with a garrison = ve všech městech s posádkou + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 873742b23f..1264f6ee96 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -1304,16 +1304,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = in deze stad -in all cities = in alle steden -in all coastal cities = in alle kuststeden -in capital = in de hoofdstad -in all non-occupied cities = in alle niet-bezette steden -in all cities with a world wonder = in alle steden met een wereldwonder -in all cities connected to capital = in alle steden verbonden met de hoofdstad -in all cities with a garrison = in alle steden met een garnizoen - # Uniques that are relevant to more than one type of game object @@ -1376,8 +1366,7 @@ ConditionalsPlacement = after # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1387,6 +1376,33 @@ ConditionalsPlacement = after +######### City filters ########### + +in this city = in deze stad +in all cities = in alle steden +in all coastal cities = in alle kuststeden +in capital = in de hoofdstad +in all non-occupied cities = in alle niet-bezette steden +in all cities with a world wonder = in alle steden met een wereldwonder +in all cities connected to capital = in alle steden verbonden met de hoofdstad +in all cities with a garrison = in alle steden met een garnizoen + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = Verering van voorouders diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 9364de45b8..6e4339c2f8 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -2310,24 +2310,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters - # Requires translation! -in this city = - # Requires translation! -in all cities = - # Requires translation! -in all coastal cities = - # Requires translation! -in capital = - # Requires translation! -in all non-occupied cities = - # Requires translation! -in all cities with a world wonder = - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -2409,8 +2391,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -2420,6 +2401,41 @@ ConditionalsPlacement = +######### City filters ########### + + # Requires translation! +in this city = + # Requires translation! +in all cities = + # Requires translation! +in all coastal cities = + # Requires translation! +in capital = + # Requires translation! +in all non-occupied cities = + # Requires translation! +in all cities with a world wonder = + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 5d92f06ec0..8a526bf3da 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -1480,24 +1480,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters - # Requires translation! -in this city = - # Requires translation! -in all cities = - # Requires translation! -in all coastal cities = - # Requires translation! -in capital = - # Requires translation! -in all non-occupied cities = - # Requires translation! -in all cities with a world wonder = - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -1577,8 +1559,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1588,6 +1569,41 @@ ConditionalsPlacement = +######### City filters ########### + + # Requires translation! +in this city = + # Requires translation! +in all cities = + # Requires translation! +in all coastal cities = + # Requires translation! +in capital = + # Requires translation! +in all non-occupied cities = + # Requires translation! +in all cities with a world wonder = + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 57e7dde16d..e713f3095c 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1373,17 +1373,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = dans cette ville -in all cities = dans toutes les villes -in all coastal cities = dans toutes les villes cotières -in capital = dans la capitale - # Requires translation! -in all non-occupied cities = -in all cities with a world wonder = dans toutes les villes avec une merveille du monde -in all cities connected to capital = dans toutes les villes connectées à la capitale -in all cities with a garrison = dans toutes les villes avec une garnison - # Uniques that are relevant to more than one type of game object @@ -1452,8 +1441,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1463,6 +1451,34 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = dans cette ville +in all cities = dans toutes les villes +in all coastal cities = dans toutes les villes cotières +in capital = dans la capitale + # Requires translation! +in all non-occupied cities = +in all cities with a world wonder = dans toutes les villes avec une merveille du monde +in all cities connected to capital = dans toutes les villes connectées à la capitale +in all cities with a garrison = dans toutes les villes avec une garnison + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 8262cc576a..0f49ee348a 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -1239,16 +1239,6 @@ Date ￬ = Datum ￬ Stars ￬ = Sterne ￬ Status ￬ = Status ￬ -# City filters -in this city = in dieser Stadt -in all cities = in allen Städten -in all coastal cities = in allen Küstenstädten -in capital = in der Hauptstadt -in all non-occupied cities = in allen nicht besetzten Städten -in all cities with a world wonder = in allen Städten mit einem Weltwunder -in all cities connected to capital = in allen Städten die mit der Hauptstadt verbunden sind -in all cities with a garrison = in allen Städten mit einer Garnison - # Uniques that are relevant to more than one type of game object @@ -1308,8 +1298,7 @@ ConditionalsPlacement = after # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1319,6 +1308,33 @@ ConditionalsPlacement = after +######### City filters ########### + +in this city = in dieser Stadt +in all cities = in allen Städten +in all coastal cities = in allen Küstenstädten +in capital = in der Hauptstadt +in all non-occupied cities = in allen nicht besetzten Städten +in all cities with a world wonder = in allen Städten mit einem Weltwunder +in all cities connected to capital = in allen Städten die mit der Hauptstadt verbunden sind +in all cities with a garrison = in allen Städten mit einer Garnison + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = Ahnenkult diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index cd6bdb1fe3..fd3aee9f83 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -1962,17 +1962,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = Σε αυτήν την πόλη -in all cities = Σε όλες τις πόλεις -in all coastal cities = Σε όλες τι παραλιακές πόλεις -in capital = Στην πρωτεύουσα -in all non-occupied cities = Σε όλες τις μή-καταλελημένες πόλεις -in all cities with a world wonder = Σε όλες τις πόλεις με ένα θαύμα του κόσμου -in all cities connected to capital = Σε όλες τις συνδεδεμένες πόλεις με την προτεύουσα - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -2050,8 +2039,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -2061,6 +2049,34 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = Σε αυτήν την πόλη +in all cities = Σε όλες τις πόλεις +in all coastal cities = Σε όλες τι παραλιακές πόλεις +in capital = Στην πρωτεύουσα +in all non-occupied cities = Σε όλες τις μή-καταλελημένες πόλεις +in all cities with a world wonder = Σε όλες τις πόλεις με ένα θαύμα του κόσμου +in all cities connected to capital = Σε όλες τις συνδεδεμένες πόλεις με την προτεύουσα + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index ded713c580..f0a5164e85 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -1486,19 +1486,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = ebben a városban -in all cities = minden városban -in all coastal cities = minden tengerparti városban -in capital = a fővárosban - # Requires translation! -in all non-occupied cities = -in all cities with a world wonder = minden városban ahol van természeti csoda - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -1572,8 +1559,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1583,6 +1569,36 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = ebben a városban +in all cities = minden városban +in all coastal cities = minden tengerparti városban +in capital = a fővárosban + # Requires translation! +in all non-occupied cities = +in all cities with a world wonder = minden városban ahol van természeti csoda + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 339c7ddd1f..b97eff44eb 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -1239,16 +1239,6 @@ Date ￬ = Tanggal ￬ Stars ￬ = Bintang ￬ Status ￬ = Status ￬ -# City filters -in this city = di kota ini -in all cities = di semua kota -in all coastal cities = di semua kota pesisir -in capital = di ibu kota -in all non-occupied cities = di semua kota yang tidak sedang 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 - # Uniques that are relevant to more than one type of game object @@ -1309,8 +1299,7 @@ ConditionalsPlacement = after # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1320,6 +1309,33 @@ ConditionalsPlacement = after +######### City filters ########### + +in this city = di kota ini +in all cities = di semua kota +in all coastal cities = di semua kota pesisir +in capital = di ibu kota +in all non-occupied cities = di semua kota yang tidak sedang 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! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = Pemujaan Roh Nenek Moyang diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 86c575ae57..4a71e81b93 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -1240,16 +1240,6 @@ Date ￬ = Data ￬ Stars ￬ = Stelle ￬ Status ￬ = Stato ￬ -# City filters -in this city = in questa città -in all cities = in tutte le città -in all coastal cities = in ogni città costiera -in capital = nella Capitale -in all non-occupied cities = in tutte le città non occupate -in all cities with a world wonder = in tutte le città con una Meraviglia Mondiale -in all cities connected to capital = in tutte le città connesse alla Capitale -in all cities with a garrison = in tutte le città con una guarnigione - # Uniques that are relevant to more than one type of game object @@ -1310,8 +1300,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1321,6 +1310,33 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = in questa città +in all cities = in tutte le città +in all coastal cities = in ogni città costiera +in capital = nella Capitale +in all non-occupied cities = in tutte le città non occupate +in all cities with a world wonder = in tutte le città con una Meraviglia Mondiale +in all cities connected to capital = in tutte le città connesse alla Capitale +in all cities with a garrison = in tutte le città con una guarnigione + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = Culto degli antenati diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 7ce1acbf21..d84eebdc00 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -1446,17 +1446,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = この都市で -in all cities = 全ての都市で -in all coastal cities = すべての沿岸都市で -in capital = 首都で - # Requires translation! -in all non-occupied cities = -in all cities with a world wonder = 遺産があるすべての都市で -in all cities connected to capital = 首都に接続するすべての都市で -in all cities with a garrison = 駐留中のユニットがいるすべての都市で - # Uniques that are relevant to more than one type of game object @@ -1527,8 +1516,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1538,6 +1526,34 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = この都市で +in all cities = 全ての都市で +in all coastal cities = すべての沿岸都市で +in capital = 首都で + # Requires translation! +in all non-occupied cities = +in all cities with a world wonder = 遺産があるすべての都市で +in all cities connected to capital = 首都に接続するすべての都市で +in all cities with a garrison = 駐留中のユニットがいるすべての都市で + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index b35d217bec..1324d9e3c4 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -1309,16 +1309,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = 이 도시 -in all cities = 모든 도시 -in all coastal cities = 해안 도시 -in capital = 수도 -in all non-occupied cities = 점령되지 않은 도시 -in all cities with a world wonder = 세계 불가사의가 건설된 도시 -in all cities connected to capital = 수도와 연결된 도시 -in all cities with a garrison = 유닛이 주둔한 도시 - # Uniques that are relevant to more than one type of game object @@ -1382,8 +1372,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1393,6 +1382,33 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = 이 도시 +in all cities = 모든 도시 +in all coastal cities = 해안 도시 +in capital = 수도 +in all non-occupied cities = 점령되지 않은 도시 +in all cities with a world wonder = 세계 불가사의가 건설된 도시 +in all cities connected to capital = 수도와 연결된 도시 +in all cities with a garrison = 유닛이 주둔한 도시 + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = 조상 숭배 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index d15d8d2941..2695d4c0c2 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -1616,24 +1616,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters - # Requires translation! -in this city = - # Requires translation! -in all cities = - # Requires translation! -in all coastal cities = - # Requires translation! -in capital = - # Requires translation! -in all non-occupied cities = - # Requires translation! -in all cities with a world wonder = - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -1715,8 +1697,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1726,6 +1707,41 @@ ConditionalsPlacement = +######### City filters ########### + + # Requires translation! +in this city = + # Requires translation! +in all cities = + # Requires translation! +in all coastal cities = + # Requires translation! +in capital = + # Requires translation! +in all non-occupied cities = + # Requires translation! +in all cities with a world wonder = + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 634c1f18d0..eb951a4abc 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1907,24 +1907,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters - # Requires translation! -in this city = - # Requires translation! -in all cities = - # Requires translation! -in all coastal cities = - # Requires translation! -in capital = - # Requires translation! -in all non-occupied cities = - # Requires translation! -in all cities with a world wonder = - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -2006,8 +1988,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -2017,6 +1998,41 @@ ConditionalsPlacement = +######### City filters ########### + + # Requires translation! +in this city = + # Requires translation! +in all cities = + # Requires translation! +in all coastal cities = + # Requires translation! +in capital = + # Requires translation! +in all non-occupied cities = + # Requires translation! +in all cities with a world wonder = + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 420ebc4c28..56b2327c1a 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -1616,24 +1616,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters - # Requires translation! -in this city = - # Requires translation! -in all cities = - # Requires translation! -in all coastal cities = - # Requires translation! -in capital = - # Requires translation! -in all non-occupied cities = - # Requires translation! -in all cities with a world wonder = - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -1715,8 +1697,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1726,6 +1707,41 @@ ConditionalsPlacement = +######### City filters ########### + + # Requires translation! +in this city = + # Requires translation! +in all cities = + # Requires translation! +in all coastal cities = + # Requires translation! +in capital = + # Requires translation! +in all non-occupied cities = + # Requires translation! +in all cities with a world wonder = + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index c2dd130f1c..558684b539 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -1613,24 +1613,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters - # Requires translation! -in this city = - # Requires translation! -in all cities = - # Requires translation! -in all coastal cities = - # Requires translation! -in capital = - # Requires translation! -in all non-occupied cities = - # Requires translation! -in all cities with a world wonder = - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -1712,8 +1694,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1723,6 +1704,41 @@ ConditionalsPlacement = +######### City filters ########### + + # Requires translation! +in this city = + # Requires translation! +in all cities = + # Requires translation! +in all coastal cities = + # Requires translation! +in capital = + # Requires translation! +in all non-occupied cities = + # Requires translation! +in all cities with a world wonder = + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 427d22638c..50448d94a6 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -1421,17 +1421,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = w tym mieście -in all cities = w każdym mieście -in all coastal cities = we wszystkich przybrzeżnych miastach -in capital = w stolicy - # Requires translation! -in all non-occupied cities = -in all cities with a world wonder = we wszystkich miastach z cudem świata -in all cities connected to capital = we wszystkich miastach połączonych ze stolicą -in all cities with a garrison = we wszystkich miastach z garnizonem - # Uniques that are relevant to more than one type of game object @@ -1503,8 +1492,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1514,6 +1502,34 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = w tym mieście +in all cities = w każdym mieście +in all coastal cities = we wszystkich przybrzeżnych miastach +in capital = w stolicy + # Requires translation! +in all non-occupied cities = +in all cities with a world wonder = we wszystkich miastach z cudem świata +in all cities connected to capital = we wszystkich miastach połączonych ze stolicą +in all cities with a garrison = we wszystkich miastach z garnizonem + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 9120e244ef..11b2f1068f 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -1340,16 +1340,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = nesta cidade -in all cities = em todas as cidades -in all coastal cities = em todas as cidades litorais -in capital = na capital -in all non-occupied cities = em todas as cidades não ocupadas -in all cities with a world wonder = em todas as cidades com uma maravilha do mundo -in all cities connected to capital = em todas as cidades conectadas á capital -in all cities with a garrison = em todas as cidade com tropas - # Uniques that are relevant to more than one type of game object @@ -1414,8 +1404,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1425,6 +1414,33 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = nesta cidade +in all cities = em todas as cidades +in all coastal cities = em todas as cidades litorais +in capital = na capital +in all non-occupied cities = em todas as cidades não ocupadas +in all cities with a world wonder = em todas as cidades com uma maravilha do mundo +in all cities connected to capital = em todas as cidades conectadas á capital +in all cities with a garrison = em todas as cidade com tropas + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = Adoração ao Ancestral diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index e4b69600c8..acdfa95e98 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -1690,24 +1690,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters - # Requires translation! -in this city = - # Requires translation! -in all cities = - # Requires translation! -in all coastal cities = - # Requires translation! -in capital = - # Requires translation! -in all non-occupied cities = - # Requires translation! -in all cities with a world wonder = - # Requires translation! -in all cities connected to capital = - # Requires translation! -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -1788,8 +1770,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1799,6 +1780,41 @@ ConditionalsPlacement = +######### City filters ########### + + # Requires translation! +in this city = + # Requires translation! +in all cities = + # Requires translation! +in all coastal cities = + # Requires translation! +in capital = + # Requires translation! +in all non-occupied cities = + # Requires translation! +in all cities with a world wonder = + # Requires translation! +in all cities connected to capital = + # Requires translation! +in all cities with a garrison = + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 7e2575e421..cf5f419367 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -1278,16 +1278,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = в этом городе -in all cities = во всех городах -in all coastal cities = во всех прибрежных городах -in capital = в столице -in all non-occupied cities = во всех незанятых городах -in all cities with a world wonder = во всех городах с чудом света -in all cities connected to capital = во всех городах, связанных со столицей -in all cities with a garrison = во всех городах с гарнизоном - # Uniques that are relevant to more than one type of game object @@ -1351,8 +1341,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1362,6 +1351,33 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = в этом городе +in all cities = во всех городах +in all coastal cities = во всех прибрежных городах +in capital = в столице +in all non-occupied cities = во всех незанятых городах +in all cities with a world wonder = во всех городах с чудом света +in all cities connected to capital = во всех городах, связанных со столицей +in all cities with a garrison = во всех городах с гарнизоном + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = Культ Предков diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 6f79af1444..fedb9b244f 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -1334,16 +1334,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = 所在城市 -in all cities = 每座城市 -in all coastal cities = 每座海滨城市 -in capital = 首都 -in all non-occupied cities = 每座非占领城市 -in all cities with a world wonder = 每座拥有世界奇观的城市 -in all cities connected to capital = 每座有贸易路线与首都相连的城市 -in all cities with a garrison = 每座有军事单位镇守的城市 - # Uniques that are relevant to more than one type of game object @@ -1408,8 +1398,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1419,6 +1408,33 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = 所在城市 +in all cities = 每座城市 +in all coastal cities = 每座海滨城市 +in capital = 首都 +in all non-occupied cities = 每座非占领城市 +in all cities with a world wonder = 每座拥有世界奇观的城市 +in all cities connected to capital = 每座有贸易路线与首都相连的城市 +in all cities with a garrison = 每座有军事单位镇守的城市 + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = 祖先崇拜 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 1de20cb8ba..8cf4021ace 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -1239,16 +1239,6 @@ Date ￬ = Fecha ￬ Stars ￬ = Estrellas ￪ Status ￬ = Estrellas ￬ -# City filters -in this city = en esta ciudad -in all cities = en cada ciudad -in all coastal cities = en cada ciudad costera -in capital = en capital -in all non-occupied cities = en todas las ciudades no-ocupadas -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 - # Uniques that are relevant to more than one type of game object @@ -1308,8 +1298,7 @@ ConditionalsPlacement = after # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1319,6 +1308,33 @@ ConditionalsPlacement = after +######### City filters ########### + +in this city = en esta ciudad +in all cities = en cada ciudad +in all coastal cities = en cada ciudad costera +in capital = en capital +in all non-occupied cities = en todas las ciudades no-ocupadas +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! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = Alabanza Ancestral diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 6b481c809c..93b5c77f3b 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -1239,16 +1239,6 @@ Date ￬ = Datum ￬ Stars ￬ = Stjärnor ￬ Status ￬ = Status ￬ -# City filters -in this city = i denna stad -in all cities = i alla städer -in all coastal cities = i alla kuststäder -in capital = i huvudstaden -in all non-occupied cities = i alla icke-ockuperade städer -in all cities with a world wonder = i alla städer med ett världsunderverk -in all cities connected to capital = i alla städer anslutna till huvudstaden -in all cities with a garrison = i alla städer med garnison - # Uniques that are relevant to more than one type of game object @@ -1308,8 +1298,7 @@ ConditionalsPlacement = after # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1319,6 +1308,33 @@ ConditionalsPlacement = after +######### City filters ########### + +in this city = i denna stad +in all cities = i alla städer +in all coastal cities = i alla kuststäder +in capital = i huvudstaden +in all non-occupied cities = i alla icke-ockuperade städer +in all cities with a world wonder = i alla städer med ett världsunderverk +in all cities connected to capital = i alla städer anslutna till huvudstaden +in all cities with a garrison = i alla städer med garnison + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### Ancestor Worship = Förfädersdyrkan diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 005eb9aab9..af89708bdb 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -1521,17 +1521,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = 所在城市 -in all cities = 每座城市 -in all coastal cities = 每座海濱城市 -in capital = 首都 - # Requires translation! -in all non-occupied cities = -in all cities with a world wonder = 每座擁有世界奇觀的城市 -in all cities connected to capital = 每座有貿易路線與首都相連的城市 -in all cities with a garrison = 每座有軍事單位鎮守的城市 - # Uniques that are relevant to more than one type of game object @@ -1603,8 +1592,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1614,6 +1602,34 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = 所在城市 +in all cities = 每座城市 +in all coastal cities = 每座海濱城市 +in capital = 首都 + # Requires translation! +in all non-occupied cities = +in all cities with a world wonder = 每座擁有世界奇觀的城市 +in all cities connected to capital = 每座有貿易路線與首都相連的城市 +in all cities with a garrison = 每座有軍事單位鎮守的城市 + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 1ce7be2f28..67682c9393 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -1398,16 +1398,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = bu şehirde -in all cities = her şehirde -in all coastal cities = her kıyı şehrinde -in capital = başkentte -in all non-occupied cities = Fethedilmemiş bütün şehirlerde -in all cities with a world wonder = dünya harikası bulunan tüm şehirlerde -in all cities connected to capital = başkente yol bağlantısı olan tüm şehirlerde -in all cities with a garrison = garnizon bulunan tüm şehirlerde - # Uniques that are relevant to more than one type of game object @@ -1472,8 +1462,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1483,6 +1472,33 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = bu şehirde +in all cities = her şehirde +in all coastal cities = her kıyı şehrinde +in capital = başkentte +in all non-occupied cities = Fethedilmemiş bütün şehirlerde +in all cities with a world wonder = dünya harikası bulunan tüm şehirlerde +in all cities connected to capital = başkente yol bağlantısı olan tüm şehirlerde +in all cities with a garrison = garnizon bulunan tüm şehirlerde + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 6c750e46ba..584f9db33e 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -1422,16 +1422,6 @@ Stars ￬ = # Requires translation! Status ￬ = -# City filters -in this city = в цьому місті -in all cities = в кожному місті -in all coastal cities = в кожному прибережному місті -in capital = в столиці -in all non-occupied cities = у кожному вільному від окупації місті -in all cities with a world wonder = у кожному місті з дивом світу -in all cities connected to capital = у кожному місті, сполученому зі столицею -in all cities with a garrison = у кожному місті з гарнізоном - # Uniques that are relevant to more than one type of game object @@ -1500,8 +1490,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. - # Requires translation! -# = +# = @@ -1511,6 +1500,33 @@ ConditionalsPlacement = +######### City filters ########### + +in this city = в цьому місті +in all cities = в кожному місті +in all coastal cities = в кожному прибережному місті +in capital = в столиці +in all non-occupied cities = у кожному вільному від окупації місті +in all cities with a world wonder = у кожному місті з дивом світу +in all cities connected to capital = у кожному місті, сполученому зі столицею +in all cities with a garrison = у кожному місті з гарнізоном + # Requires translation! +in all cities in which the majority religion is a major religion = + # Requires translation! +in all cities in which the majority religion is an enhanced religion = + # Requires translation! +in non-enemy foreign cities = + # Requires translation! +in foreign cities = + # Requires translation! +in annexed cities = + # Requires translation! +in holy cities = + # Requires translation! +in City-State cities = + # Requires translation! +in cities following this religion = + #################### Lines from Beliefs from Civ V - Vanilla #################### # Requires translation! diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 1916b44338..88da8f973d 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,13 +1,13 @@ Persian_(Pinglish-UN) = 19 Italian = 99 -Russian = 92 +Russian = 91 German = 99 Swedish = 99 Turkish = 83 Ukrainian = 81 French = 76 Portuguese = 67 -Indonesian = 99 +Indonesian = 98 Finnish = 48 Spanish = 98 Malay = 16 diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 21bb8ad398..f51a0167f7 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -1248,16 +1248,6 @@ Date ￬ = Stars ￬ = Status ￬ = -# City filters -in this city = -in all cities = -in all coastal cities = -in capital = -in all non-occupied cities = -in all cities with a world wonder = -in all cities connected to capital = -in all cities with a garrison = - # Uniques that are relevant to more than one type of game object @@ -1317,7 +1307,7 @@ ConditionalsPlacement = # it's removed for now, but it will return once all planned conditionals have been added. -# = +# = diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index c8451cc7f2..051591b76e 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -657,6 +657,7 @@ class CityInfo { } } + // When adding here, add to UniqueParameterType.cityFilterStrings fun matchesFilter(filter: String, viewingCiv: CivilizationInfo = civInfo): Boolean { return when (filter) { "in this city" -> true diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index b649f1acd4..6bdb31fc80 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -48,7 +48,7 @@ enum class UniqueParameterType(val parameterName:String) { CityFilter("cityFilter"){ override fun getErrorSeverity(parameterText: String, ruleset: Ruleset): UniqueType.UniqueComplianceErrorSeverity? { - if (parameterText !in cityFilterMap) + if (parameterText !in cityFilterStrings) return UniqueType.UniqueComplianceErrorSeverity.RulesetInvariant return null } @@ -89,7 +89,7 @@ enum class UniqueParameterType(val parameterName:String) { // Note: this can't handle combinations of parameters (e.g. [{Military} {Water}]) ) - val cityFilterMap = setOf( // taken straight from the translation! + val cityFilterStrings = setOf( // taken straight from the translation! "in this city", "in all cities", "in all coastal cities", diff --git a/core/src/com/unciv/models/translations/TranslationFileWriter.kt b/core/src/com/unciv/models/translations/TranslationFileWriter.kt index 1beed7dcd6..27369da314 100644 --- a/core/src/com/unciv/models/translations/TranslationFileWriter.kt +++ b/core/src/com/unciv/models/translations/TranslationFileWriter.kt @@ -70,6 +70,9 @@ object TranslationFileWriter { if (templateFile.exists()) linesToTranslate.addAll(templateFile.reader(TranslationFileReader.charset).readLines()) + linesToTranslate += "\n######### City filters ###########\n" + linesToTranslate.addAll(UniqueParameterType.cityFilterStrings.map { "$it = " }) + for (baseRuleset in BaseRuleset.values()) { val generatedStringsFromBaseRuleset = generateStringsFromJSONs(Gdx.files.local("jsons/${baseRuleset.fullName}")) @@ -273,7 +276,7 @@ object TranslationFileWriter { parameter in buildingMap -> "building" parameter in unitTypeMap -> "unitType" Stats.isStats(parameter) -> "stats" - parameter in UniqueParameterType.cityFilterMap -> "cityFilter" + parameter in UniqueParameterType.cityFilterStrings -> "cityFilter" else -> "param" } if (parameterName in existingParameterNames) {