4.3.2

android/assets/jsons/translations/Brazilian_Portuguese.properties

@@ -2026,6 +2026,19 @@ Triggers a global alert upon build start = Aciona um alerta global no início da
 Triggers a Cultural Victory upon completion = Aciona uma Vitória Cultural após a conclusão
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Oferece um luxo único
+
+Provides military units every ≈[20] turns = Fornece unidades militares a cada [20] turnos
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colonizador
@@ -4887,6 +4900,9 @@ Mosque = Mesquita
 Pagoda = Pagode
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6098,8 +6114,6 @@ Nullifies Growth [cityFilter] = Anula o crescimento de [cityFilter]
 Provides [stats] per turn = Fornece [stats] por turno
 Provides [stats] [cityFilter] per turn = Fornece [stats] de [cityFilter] por turno 
 Provides [amount] Happiness = Fornece [amount] de Felicidade
-Provides military units every ≈[amount] turns = Fornece unidades militares a cada [amount] turnos
-Provides a unique luxury = Oferece um luxo único
 Cannot build [baseUnitFilter] units = Não é possível construir unidades [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Pode escolher [amount] crenças adicionais [beliefType] ao [foundingOrEnhancing] uma religião
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Pode comprar edifícios [buildingFilter] por [amount] [stat] [cityFilter] a um preço crescente ([amount2])

android/assets/jsons/translations/Bulgarian.properties

@@ -2961,6 +2961,21 @@ Triggers a global alert upon build start =
 Triggers a Cultural Victory upon completion = 
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
  # Requires translation!
@@ -8009,6 +8024,9 @@ Mosque =
 Pagoda = 
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -10088,10 +10106,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Catalan.properties

@@ -2026,6 +2026,19 @@ Triggers a global alert upon build start = Provoca una alerta global quan es com
 Triggers a Cultural Victory upon completion = Desencadena la victòria cultural quan es completa.
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Proporciona un luxe exclusiu.
+
+Provides military units every ≈[20] turns = Proporciona unitats militars més o menys cada [20] torns.
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colon
@@ -4887,6 +4900,9 @@ Mosque = Mesquita
 Pagoda = Pagoda
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6098,8 +6114,6 @@ Nullifies Growth [cityFilter] = Anul·la el creixement de [cityFilter].
 Provides [stats] per turn = Proporciona [stats] per torn.
 Provides [stats] [cityFilter] per turn = Proporciona [stats] [cityFilter].
 Provides [amount] Happiness = Proporciona [amount] de felicitat.
-Provides military units every ≈[amount] turns = Proporciona unitats militars més o menys cada [amount] torns.
-Provides a unique luxury = Proporciona un luxe exclusiu.
 Cannot build [baseUnitFilter] units = Les unitats [baseUnitFilter] no es poden construir.
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Pot triar [amount] creences [beliefType] addicionals quan es [foundingOrEnhancing] una religió.
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Pot comprar edificis [buildingFilter] per [amount] [stat] [cityFilter] a un preu creixent ([amount2]).

android/assets/jsons/translations/Czech.properties

@@ -2325,6 +2325,19 @@ Triggers a global alert upon build start = Vyvolá globální upozornění při
 Triggers a Cultural Victory upon completion = Vyvolá kulturní vítězství po dokončení
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Poskytuje jedinečnou luxusní surovinu 
+
+Provides military units every ≈[20] turns = Poskytuje vojenskou jednotku každých ≈[20] tahů
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Osadník
@@ -5239,6 +5252,9 @@ Mosque = Mešita
 Pagoda = Pagoda
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6850,8 +6866,6 @@ Nullifies Growth [cityFilter] =
 Provides [stats] per turn = Poskytuje [stats] za tah
 Provides [stats] [cityFilter] per turn = Poskytuje [stats] [cityFilter] za tah
 Provides [amount] Happiness = Poskytuje [amount] spokojenosti
-Provides military units every ≈[amount] turns = Poskytuje vojenskou jednotku každých ≈[amount] tahů
-Provides a unique luxury = Poskytuje jedinečnou luxusní surovinu 
 Cannot build [baseUnitFilter] units = Nelze stavět [baseUnitFilter] jendotky
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Může navíc zvolit [amount] přesvědčení typu [beliefType] vždy při [foundingOrEnhancing] náboženství
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Může koupit [buildingFilter] budovy za [amount] [stat] [cityFilter] se zvyšující se cenou ([amount2])

android/assets/jsons/translations/Dutch.properties

@@ -2153,6 +2153,21 @@ Triggers a global alert upon build start = Veroorzaakt een globaal alarmsignaal
 Triggers a Cultural Victory upon completion = Veroorzaakt een Culturele overwinning bij voltooiing
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Kolonist
@@ -5702,6 +5717,9 @@ Mosque = Moskee
 Pagoda = Pagode
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -7890,10 +7908,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/English.properties

@@ -3687,6 +3687,21 @@ Triggers a global alert upon build start =
 Triggers a Cultural Victory upon completion = 
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
  # Requires translation!
@@ -8818,6 +8833,9 @@ Mosque =
 Pagoda = 
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -11023,10 +11041,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Filipino.properties

@@ -2032,6 +2032,20 @@ Triggers a global alert upon build start = Nagti-trigger ng pandaigdigang abiso
 Triggers a Cultural Victory upon completion = Nag-trigger ng Kultural na Tagumpay kapag natapos na
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Nagbibigay ng isang natatanging karangyaan
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Naninirahan
@@ -4920,6 +4934,9 @@ Mosque = Mosque
 Pagoda = Pagoda
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6303,9 +6320,6 @@ Nullifies Growth [cityFilter] = Nagpapawalang-bisa ng Paglaki [cityFilter]
 Provides [stats] per turn = Nagbibigay ng [stats] kada turno
 Provides [stats] [cityFilter] per turn = Nagbibigay ng [stats] [cityFilter] kada turno
 Provides [amount] Happiness = Nagbibigay ng [amount] Kaligayahan
- # Requires translation!
-Provides military units every ≈[amount] turns = 
-Provides a unique luxury = Nagbibigay ng isang natatanging karangyaan
 Cannot build [baseUnitFilter] units = Hindi kayang gumawa ng mga [baseUnitFilter] na yunit
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Finnish.properties

@@ -2735,6 +2735,21 @@ Triggers a global alert upon build start =
 Triggers a Cultural Victory upon completion = 
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Uudisraivaaja
@@ -6892,6 +6907,9 @@ Mosque =
 Pagoda = 
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -9086,10 +9104,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/French.properties

@@ -2026,6 +2026,19 @@ Triggers a global alert upon build start = Déclenche une alerte générale au d
 Triggers a Cultural Victory upon completion = Déclenche une Victoire Culturelle une fois achevé
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Fournit une ressource de luxe unique
+
+Provides military units every ≈[20] turns = Fournit des unités militaires tous les ≈[20] tours
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colon
@@ -4887,6 +4900,9 @@ Mosque = Mosquée
 Pagoda = Pagode
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6098,8 +6114,6 @@ Nullifies Growth [cityFilter] = Annule Croissance [cityFilter]
 Provides [stats] per turn = Fournit [stats] par tour
 Provides [stats] [cityFilter] per turn = Fournit [stats] [cityFilter] par tour
 Provides [amount] Happiness = Fournit [amount] Bonheur
-Provides military units every ≈[amount] turns = Fournit des unités militaires tous les ≈[amount] tours
-Provides a unique luxury = Fournit une ressource de luxe unique
 Cannot build [baseUnitFilter] units = Ne peut pas construire les unités [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Peut choisir [amount] croyance(s) [beliefType] supplémentaire(s) en [foundingOrEnhancing] une religion
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Peut acheter des bâtiments [buildingFilter] pour [amount] [stat] [cityFilter] avec augmentation régulière du prix ([amount2])

android/assets/jsons/translations/German.properties

@@ -2026,6 +2026,19 @@ Triggers a global alert upon build start = Löst einen globalen Alarm bei Baubeg
 Triggers a Cultural Victory upon completion = Bei Fertigstellung wird der Kultursieg erreicht
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Liefert eine einzigartige Luxusressource
+
+Provides military units every ≈[20] turns = Liefert militärische Einheiten alle ≈[20] Runden
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Siedler
@@ -4887,6 +4900,9 @@ Mosque = Moschee
 Pagoda = Pagode
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6098,8 +6114,6 @@ Nullifies Growth [cityFilter] = Setzt Wachstum [cityFilter] außer Kraft
 Provides [stats] per turn = Liefert [stats] pro Runde
 Provides [stats] [cityFilter] per turn = Liefert [stats] [cityFilter] pro Runde
 Provides [amount] Happiness = Liefert [amount] Zufriedenheit
-Provides military units every ≈[amount] turns = Liefert militärische Einheiten alle ≈[amount] Runden
-Provides a unique luxury = Liefert eine einzigartige Luxusressource
 Cannot build [baseUnitFilter] units = Kann keine [baseUnitFilter]-Einheiten bauen
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Kann [amount] zusätzliche [beliefType] Glauben wählen, wenn [foundingOrEnhancing] einer Religion
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Kann [buildingFilter]-Gebäude für [amount] [stat] [cityFilter] zu einem steigenden Preis ([amount2]) kaufen

android/assets/jsons/translations/Hungarian.properties

@@ -2619,6 +2619,21 @@ Triggers a global alert upon build start =
 Triggers a Cultural Victory upon completion = 
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Telepes
@@ -6419,6 +6434,9 @@ Mosque =
 Pagoda = 
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -8538,10 +8556,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Indonesian.properties

@@ -2026,6 +2026,19 @@ Triggers a global alert upon build start = Memicu peringatan global ketika memul
 Triggers a Cultural Victory upon completion = Memicu Kemenangan Kebudayaan saat diselesaikan
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Menyediakan barang mewah unik
+
+Provides military units every ≈[20] turns = Menyediakan unit militer setiap ≈[20] giliran
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Penetap
@@ -4887,6 +4900,9 @@ Mosque = Masjid
 Pagoda = Pagoda
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6098,8 +6114,6 @@ Nullifies Growth [cityFilter] = Mengosongkan Pertumbuhan [cityFilter]
 Provides [stats] per turn = Menyediakan [stats] per giliran
 Provides [stats] [cityFilter] per turn = Menyediakan [stats] [cityFilter] per giliran
 Provides [amount] Happiness = Menyediakan [amount] kebahagiaan
-Provides military units every ≈[amount] turns = Menyediakan unit militer setiap ≈[amount] giliran
-Provides a unique luxury = Menyediakan barang mewah unik
 Cannot build [baseUnitFilter] units = Tidak bisa membuat unit [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Dapat memilih [amount] [beliefType] tambahan saat [foundingOrEnhancing] agama
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Dapat membeli bangunan [buildingFilter] dengan [amount] [stat] [cityFilter] dengan peningkatan harga ([amount2]) 

android/assets/jsons/translations/Italian.properties

@@ -2032,6 +2032,19 @@ Triggers a global alert upon build start = Attiva un allarme globale quando iniz
 Triggers a Cultural Victory upon completion = Attiva una Vittoria Culturale quando completata
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Dona una risorsa di lusso unica
+
+Provides military units every ≈[20] turns = Dona unità militari ogni ≈[20] turni
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colono
@@ -4903,6 +4916,9 @@ Mosque = Moschea
 Pagoda = Pagoda
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6114,8 +6130,6 @@ Nullifies Growth [cityFilter] = Annulla Crescita [cityFilter]
 Provides [stats] per turn = Dona [stats] al turno
 Provides [stats] [cityFilter] per turn = Dona [stats] [cityFilter] al turno
 Provides [amount] Happiness = Dona [amount] Felicità
-Provides military units every ≈[amount] turns = Dona unità militari ogni ≈[amount] turni
-Provides a unique luxury = Dona una risorsa di lusso unica
 Cannot build [baseUnitFilter] units = Non può costruire unità [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Puoi scegliere [amount] credenze [beliefType] aggiuntive quando [foundingOrEnhancing] una religione
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Puoi acquistare edifici [buildingFilter] per [amount] [stat] [cityFilter] a un prezzo crescente ([amount2])

android/assets/jsons/translations/Japanese.properties

@@ -2333,6 +2333,19 @@ Triggers a global alert upon build start = 生産を開始すると警告が発
 Triggers a Cultural Victory upon completion = 完成すると文化勝利を収められる
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = 固有の高級資源が提供される
+
+Provides military units every ≈[20] turns = 約[20]ターンごとの軍事ユニットの贈呈
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = 開拓者
@@ -5450,6 +5463,9 @@ Mosque = モスク
 Pagoda = パゴダ
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -7484,8 +7500,6 @@ Nullifies Growth [cityFilter] = [cityFilter]成長を無効化
 Provides [stats] per turn = 毎ターン[stats]の提供
 Provides [stats] [cityFilter] per turn = [cityFilter]毎ターン[stats]の提供
 Provides [amount] Happiness = 幸福度[amount]の提供
-Provides military units every ≈[amount] turns = 約[amount]ターンごとの軍事ユニットの贈呈
-Provides a unique luxury = 固有の高級資源が提供される
 Cannot build [baseUnitFilter] units = [baseUnitFilter]ユニットを生産できない
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Korean.properties

@@ -2044,6 +2044,19 @@ Triggers a global alert upon build start = 건설 시작시 전 세계에 알림
 Triggers a Cultural Victory upon completion = 건설시 문화 승리를 거둠
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = 고유 사치 자원 제공
+
+Provides military units every ≈[20] turns = 약 [20] 턴마다 군사 유닛 제공
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = 개척자
@@ -4905,6 +4918,9 @@ Mosque = 모스크
 Pagoda = 파고다
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6117,8 +6133,6 @@ Nullifies Growth [cityFilter] = [cityFilter]의 성장을 0으로 함
 Provides [stats] per turn = 매 턴 [stats] 제공
 Provides [stats] [cityFilter] per turn = 매 턴 [cityFilter]에 [stats] 제공
 Provides [amount] Happiness = 행복도 [amount] 제공
-Provides military units every ≈[amount] turns = 약 [amount] 턴마다 군사 유닛 제공
-Provides a unique luxury = 고유 사치 자원 제공
 Cannot build [baseUnitFilter] units = [baseUnitFilter] 유닛 생산 불가
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 종교 [foundingOrEnhancing]시 [amount]개의 추가 [beliefType] 교리 선택 가능
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = [cityFilter]에서 [amount] [stat](으)로 [buildingFilter] 구매 가능, 비용 [amount2]씩 증가

android/assets/jsons/translations/Lithuanian.properties

@@ -2029,6 +2029,19 @@ Triggers a global alert upon build start = Pasaulinis pranešimas pradedant stat
 Triggers a Cultural Victory upon completion = Kultūrinė pergalė užbaigus
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Duoda unikalų \nresursą
+
+Provides military units every ≈[20] turns = Duoda ♮Karių per ≈[20] \nėjimų
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Gyventojas
@@ -4890,6 +4903,9 @@ Mosque = Mečetė
 Pagoda = Pagoda
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6102,8 +6118,6 @@ Nullifies Growth [cityFilter] = Panaikina augimą: [cityFilter]
 Provides [stats] per turn = Duoda: [stats] \nper ėjimą 
 Provides [stats] [cityFilter] per turn = Duoda [stats] [cityFilter] \nper ėjimą 
 Provides [amount] Happiness = Duoda [amount] \n ⌣Laimės
-Provides military units every ≈[amount] turns = Duoda ♮Karių per ≈[amount] \nėjimų
-Provides a unique luxury = Duoda unikalų \nresursą
 Cannot build [baseUnitFilter] units = Negali gaminti: [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Galima rinktis [amount] papildomų tikėjimų: [beliefType] kada [foundingOrEnhancing] religija
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Galima pirkti: [buildingFilter] už: [amount] [stat] [cityFilter] didėjančia kaina: ([amount2])

android/assets/jsons/translations/Malay.properties

@@ -2742,6 +2742,21 @@ Triggers a global alert upon build start =
 Triggers a Cultural Victory upon completion = 
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Peneroka
@@ -7625,6 +7640,9 @@ Mosque =
 Pagoda = 
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -9815,10 +9833,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Persian_(Pinglish-DIN).properties

@@ -3029,6 +3029,21 @@ Triggers a global alert upon build start =
 Triggers a Cultural Victory upon completion = 
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
  # Requires translation!
@@ -8123,6 +8138,9 @@ Mosque =
 Pagoda = 
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -10322,10 +10340,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Persian_(Pinglish-UN).properties

@@ -2954,6 +2954,21 @@ Triggers a global alert upon build start =
 Triggers a Cultural Victory upon completion = 
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
  # Requires translation!
@@ -8048,6 +8063,9 @@ Mosque =
 Pagoda = 
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -10247,10 +10265,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Polish.properties

@@ -2028,6 +2028,19 @@ Triggers a global alert upon build start = Po rozpoczęciu budowania inicjuje al
 Triggers a Cultural Victory upon completion = Zakończenie oznacza Zwycięstwo Kulturowe
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Zapewnia unikalny surowiec luksusowy
+
+Provides military units every ≈[20] turns = Zapewnia jednostki militarne co około [20] tur
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Osadnik
@@ -4891,6 +4904,9 @@ Mosque = Meczet
 Pagoda = Pagoda
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6106,8 +6122,6 @@ Nullifies Growth [cityFilter] = Zeruje rozwój [cityFilter]
 Provides [stats] per turn = Zapewnia [stats] na turę
 Provides [stats] [cityFilter] per turn = Zapewnia [stats] [cityFilter] na turę
 Provides [amount] Happiness = Zapewnia [amount] ⌣Zadowolenia
-Provides military units every ≈[amount] turns = Zapewnia jednostki militarne co około [amount] tur
-Provides a unique luxury = Zapewnia unikalny surowiec luksusowy
 Cannot build [baseUnitFilter] units = Nie można zbudować jednostek [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Można wybrać [amount] dodatkowych wierzeń [beliefType] gdy [foundingOrEnhancing] religia
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Można kupić budynki [buildingFilter] za [amount] [stat] [cityFilter] po rosnących cenach ([amount2])

android/assets/jsons/translations/Portuguese.properties

@@ -2555,6 +2555,21 @@ Triggers a global alert upon build start = Aciona um alerta global no início da
 Triggers a Cultural Victory upon completion = Desencadeia uma vitória cultural após a conclusão
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colonizador
@@ -6325,6 +6340,9 @@ Mosque =
 Pagoda = 
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -8405,10 +8423,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Romanian.properties

@@ -2118,6 +2118,21 @@ Triggers a global alert upon build start = Declanșează o alertă globală la
 Triggers a Cultural Victory upon completion = Declanșează o victorie culturală la finalizare
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colonist
@@ -5299,6 +5314,9 @@ Mosque =
 Pagoda = 
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -7176,10 +7194,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Russian.properties

@@ -2028,6 +2028,19 @@ Triggers a global alert upon build start = Вызывает глобальное
 Triggers a Cultural Victory upon completion = Приводит к культурной победе при завершении
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Даёт уникальный ресурс
+
+Provides military units every ≈[20] turns = Даёт военных юнитов каждые ≈[20] ходов
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Поселенец
@@ -4889,6 +4902,9 @@ Mosque = Мечеть
 Pagoda = Пагода
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6101,8 +6117,6 @@ Nullifies Growth [cityFilter] = Обнуляет рост [cityFilter]
 Provides [stats] per turn = Даёт [stats] за ход
 Provides [stats] [cityFilter] per turn = Даёт [stats] [cityFilter] за ход
 Provides [amount] Happiness = Даёт [amount] счастья
-Provides military units every ≈[amount] turns = Даёт военных юнитов каждые ≈[amount] ходов
-Provides a unique luxury = Даёт уникальный ресурс
 Cannot build [baseUnitFilter] units = Не может строить юниты: [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Можно дополнительно выбрать [amount] верований [beliefType] когда [foundingOrEnhancing] религия
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Можно покупать здания: [buildingFilter] за [amount] [stat] [cityFilter] по возрастающей стоимости ([amount2])

android/assets/jsons/translations/Simplified_Chinese.properties

@@ -2026,6 +2026,19 @@ Triggers a global alert upon build start = 在建造开始时触发全局警报
 Triggers a Cultural Victory upon completion = 完成后触发文化胜利
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = 提供一种独特的奢侈资源
+
+Provides military units every ≈[20] turns = 每经过约[20]回合提供一个军事单位
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = 移民
@@ -4887,6 +4900,9 @@ Mosque = 清真寺
 Pagoda = 佛塔
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6098,8 +6114,6 @@ Nullifies Growth [cityFilter] = 停止[cityFilter]中的人口增长
 Provides [stats] per turn = 每回合提供[stats]
 Provides [stats] [cityFilter] per turn = 每回合为[cityFilter]提供[stats]
 Provides [amount] Happiness = 提供[amount]快乐
-Provides military units every ≈[amount] turns = 每经过约[amount]回合提供一个军事单位
-Provides a unique luxury = 提供一种独特的奢侈资源
 Cannot build [baseUnitFilter] units = 无法建造[baseUnitFilter]单位
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 当[foundingOrEnhancing]一个宗教时，可以额外选择[amount]个[beliefType]信仰
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = [cityFilter]可以以上涨的价格（[amount2]）用[amount][stat]购买[buildingFilter]建筑

android/assets/jsons/translations/Spanish.properties

@@ -2026,6 +2026,19 @@ Triggers a global alert upon build start = Activa una alerta mundial al iniciar
 Triggers a Cultural Victory upon completion = Activa una victoria cultural al completarse
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Proporciona un lujo único.
+
+Provides military units every ≈[20] turns = Proporciona unidades militares cada ≈[20] ⏳turnos
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colono
@@ -4887,6 +4900,9 @@ Mosque = Mezquita
 Pagoda = Pagoda
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6098,8 +6114,6 @@ Nullifies Growth [cityFilter] = anula el crecimiento [cityFilter]
 Provides [stats] per turn = proporciona [stats] por ⏳turno
 Provides [stats] [cityFilter] per turn = proporciona [stats] [cityFilter] por ⏳turno
 Provides [amount] Happiness = proporciona [amount] Felicidad
-Provides military units every ≈[amount] turns = Proporciona unidades militares cada ≈[amount] ⏳turnos
-Provides a unique luxury = Proporciona un lujo único.
 Cannot build [baseUnitFilter] units = No se puede construír unidades [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Puede elegir [amount] creencias adicionales [beliefType] cuando [foundingOrEnhancing] una religion
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Puede comprar edificios "[buildingFilter]" por [amount] [stat] [cityFilter] a un precio creciente ([amount2])

android/assets/jsons/translations/Swedish.properties

@@ -2092,6 +2092,19 @@ Triggers a global alert upon build start = Utlöser en global varning när byggn
 Triggers a Cultural Victory upon completion = Utlöser en kulturell vinst när den färdigställs
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Ger en unik lyxresurs
+
+Provides military units every ≈[20] turns = Ger militära enheter vart ≈[20] drag
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Nybyggare
@@ -4957,6 +4970,9 @@ Mosque = Moské
 Pagoda = Pagod
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6515,8 +6531,6 @@ Nullifies Growth [cityFilter] = Omintetgör Tillväxt [cityFilter]
 Provides [stats] per turn = Ger [stats] per drag
 Provides [stats] [cityFilter] per turn = Ger [stats] [cityFilter] per drag
 Provides [amount] Happiness = Ger [amount] Lycka
-Provides military units every ≈[amount] turns = Ger militära enheter vart ≈[amount] drag
-Provides a unique luxury = Ger en unik lyxresurs
 Cannot build [baseUnitFilter] units = Kan inte bygga [baseUnitFilter]-enheter
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Får välja [amount] extra [beliefType]-trossatser vid [foundingOrEnhancing] av en religion
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Får köpa [buildingFilter]-byggnader för [amount] [stat] [cityFilter] till en ökande kostnad ([amount2])

android/assets/jsons/translations/Traditional_Chinese.properties

@@ -2029,6 +2029,19 @@ Triggers a global alert upon build start = 在建造開始時觸發全局警報
 Triggers a Cultural Victory upon completion = 完成後觸發文化勝利
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = 提供獨特的奢侈品
+
+Provides military units every ≈[20] turns = 每經過≈[20]回合提供一個軍事單位
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = 移民
@@ -4890,6 +4903,9 @@ Mosque = 清真寺
 Pagoda = 佛塔
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6161,8 +6177,6 @@ Nullifies Growth [cityFilter] = 停止[cityFilter]的人口增長
 Provides [stats] per turn = 每回合提供[stats]
 Provides [stats] [cityFilter] per turn = 提供[stats][cityFilter]每回合
 Provides [amount] Happiness = 提供[amount]快樂
-Provides military units every ≈[amount] turns = 每經過≈[amount]回合提供一個軍事單位
-Provides a unique luxury = 提供獨特的奢侈品
 Cannot build [baseUnitFilter] units = 無法建造[baseUnitFilter]單位
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 在[foundingOrEnhancing]一個宗教時，可以選擇[amount]個額外的[beliefType]信仰
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = 在[cityFilter]中可以用[amount] [stat]的更高價格([amount2])購買[buildingFilter]

android/assets/jsons/translations/Turkish.properties

@@ -2359,6 +2359,21 @@ Triggers a global alert upon build start = İnşaatının başlatılması küres
 Triggers a Cultural Victory upon completion = Tamamlanması durumunda Külturel Zaferi tetikler
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+ # Requires translation!
+Provides a unique luxury = 
+
+ # Requires translation!
+Provides military units every ≈[20] turns = 
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Yerleşmeci
@@ -5503,6 +5518,9 @@ Mosque = Cami
 Pagoda = Pagoda
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -7474,10 +7492,6 @@ Provides [stats] [cityFilter] per turn =
  # Requires translation!
 Provides [amount] Happiness = 
  # Requires translation!
-Provides military units every ≈[amount] turns = 
- # Requires translation!
-Provides a unique luxury = 
- # Requires translation!
 Cannot build [baseUnitFilter] units = 
  # Requires translation!
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = 

android/assets/jsons/translations/Ukrainian.properties

@@ -2028,6 +2028,19 @@ Triggers a global alert upon build start = З'являється глобаль
 Triggers a Cultural Victory upon completion = Культурна перемога по закінченню будівництва
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Забезпечує унікальний ресурс розкоші
+
+Provides military units every ≈[20] turns = Забезпечує військовими підрозділами кожні ≈[20] ходів
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Поселенець
@@ -4918,6 +4931,9 @@ Mosque = Мечеть
 Pagoda = Пагода
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6153,8 +6169,6 @@ Nullifies Growth [cityFilter] = Скасовує зростання [cityFilter]
 Provides [stats] per turn = Забезпечує [stats] за хід
 Provides [stats] [cityFilter] per turn = Забезпечує [stats] [cityFilter] за хід
 Provides [amount] Happiness = Забезпечує [amount] щастя
-Provides military units every ≈[amount] turns = Забезпечує військовими підрозділами кожні ≈[amount] ходів
-Provides a unique luxury = Забезпечує унікальний ресурс розкоші
 Cannot build [baseUnitFilter] units = Не може будувати підрозділи [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Може вибрати [amount] додаткові [beliefType] вірувань під час [foundingOrEnhancing] релігії
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) =  Може придбати [buildingFilter] споруди за [amount] [stat] [cityFilter] зі зростаючою вартістю ([amount2])

android/assets/jsons/translations/Vietnamese.properties

@@ -2027,6 +2027,19 @@ Triggers a global alert upon build start = Kích hoạt cảnh báo toàn cầu
 Triggers a Cultural Victory upon completion = Kích hoạt Chiến thắng Văn hóa sau khi hoàn thành
 
 
+#################### Lines from CityStateTypes from Civ V - Vanilla ####################
+
+ # Requires translation!
+[+3 Culture] <before the [Medieval era]> = 
+ # Requires translation!
+[+6 Culture] <starting from the [Medieval era]> <before the [Industrial era]> = 
+
+
+Provides a unique luxury = Cung cấp một sự sang trọng độc đáo
+
+Provides military units every ≈[20] turns = Cung cấp các đơn vị quân mỗi ≈ [20] lượt
+
+
 #################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Người định cư
@@ -4888,6 +4901,9 @@ Mosque = Nhà thờ Hồi giáo
 Pagoda = Chùa
 
 
+#################### Lines from CityStateTypes from Civ V - Gods & Kings ####################
+
+
 #################### Lines from Difficulties from Civ V - Gods & Kings ####################
 
 
@@ -6100,8 +6116,6 @@ Nullifies Growth [cityFilter] = Vô hiệu hóa sự tăng trưởng [cityFilter
 Provides [stats] per turn = Cung cấp [stats] mỗi lượt
 Provides [stats] [cityFilter] per turn = Cung cấp [stats] [cityFilter] mỗi lượt
 Provides [amount] Happiness = Cung cấp [amount] Hạnh phúc
-Provides military units every ≈[amount] turns = Cung cấp các đơn vị quân mỗi ≈ [amount] lượt
-Provides a unique luxury = Cung cấp một sự sang trọng độc đáo
 Cannot build [baseUnitFilter] units = Không thể tạo các đơn vị [baseUnitFilter]
 May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion = Có thể chọn [amount] tín ngưỡng [beliefType] bổ sung khi [foundingOrEnhancing] một tôn giáo
 May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount2]) = Có thể mua các tòa nhà [buildingFilter] với [amount] [stat] [cityFilter] với giá ngày càng tăng ([amount2])

android/assets/jsons/translations/completionPercentages.properties

@@ -1,24 +1,24 @@
 Persian_(Pinglish-UN) = 15
 Italian = 99
 Russian = 99
-German = 100
+German = 99
 Swedish = 91
 Turkish = 70
 Ukrainian = 98
 Filipino = 94
-French = 100
+French = 99
 Portuguese = 52
-Indonesian = 100
-Catalan = 100
+Indonesian = 99
+Catalan = 99
 Finnish = 38
-Spanish = 100
+Spanish = 99
 Malay = 24
-Brazilian_Portuguese = 100
+Brazilian_Portuguese = 99
 Traditional_Chinese = 98
 Polish = 99
 Lithuanian = 99
 Romanian = 76
-Simplified_Chinese = 100
+Simplified_Chinese = 99
 Bulgarian = 18
 Korean = 99
 Persian_(Pinglish-DIN) = 14
@@ -28,4 +28,4 @@ Vietnamese = 99
 Czech = 83
 Hungarian = 49
 Dutch = 62
-Greek = 11
+Greek = 15

changelog.md

@@ -1,26 +1,6 @@
 ## 4.3.2
 
-Fixed json tests
-
-Fixed city state tests
-
-Added validations for city-state uniques
-
-Converted all era uniques to conditional uniques for city-states
-
-Removed old deprecated bits and pieces
-
-Removed old deprecated parts
-
-cityStateType no longer causes crash
-
-CityStateType overhaul!!!!
-
-CityStateType deprecation p1
-
-Added CityStateTypes into rulesets! Not in use yet
-
-Separated ruleset validation to its own file
+City State Type overhaul!
 
 Can now use `[stats]` unique to add happiness globally
 

core/src/com/unciv/models/ruleset/Ruleset.kt

@@ -25,7 +25,6 @@ import com.unciv.models.ruleset.unit.Promotion
 import com.unciv.models.ruleset.unit.UnitType
 import com.unciv.models.stats.INamed
 import com.unciv.models.stats.NamedStats
-import com.unciv.models.translations.fillPlaceholders
 import com.unciv.models.translations.tr
 import com.unciv.ui.utils.extensions.colorFromRGB
 import com.unciv.ui.utils.getRelativeTextDistance
@@ -390,7 +389,18 @@ class Ruleset {
 
             if (speeds.isEmpty()) speeds.putAll(RulesetCache.getVanillaRuleset().speeds)
 
-            if (cityStateTypes.isEmpty()) cityStateTypes.putAll(RulesetCache.getVanillaRuleset().cityStateTypes)
+            if (cityStateTypes.isEmpty())
+                for (cityStateType in RulesetCache.getVanillaRuleset().cityStateTypes.values)
+                    cityStateTypes[cityStateType.name] = CityStateType().apply {
+                        name = cityStateType.name
+                        color = cityStateType.color
+                        friendBonusUniques = ArrayList(cityStateType.friendBonusUniques.filter {
+                            RulesetValidator(this@Ruleset).checkUnique(Unique(it),false,"",UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific,UniqueTarget.CityState).isEmpty()
+                        })
+                        allyBonusUniques = ArrayList(cityStateType.allyBonusUniques.filter {
+                            RulesetValidator(this@Ruleset).checkUnique(Unique(it),false,"",UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific,UniqueTarget.CityState).isEmpty()
+                        })
+                    }
         }
 
         debug("Loading ruleset - %sms", System.currentTimeMillis() - gameBasicsStartTime)

core/src/com/unciv/ui/trade/DiplomacyScreen.kt

@@ -192,7 +192,7 @@ class DiplomacyScreen(
 
         diplomacyTable.add(LeaderIntroTable(otherCiv)).padBottom(15f).row()
 
-        diplomacyTable.add("{Type}:  {${otherCiv.cityStateType}}".toLabel()).row()
+        diplomacyTable.add("{Type}:  {${otherCiv.cityStateType.name}}".toLabel()).row()
         diplomacyTable.add("{Personality}:  {${otherCiv.cityStatePersonality}}".toLabel()).row()
 
         if (otherCiv.detailedCivResources.any { it.resource.resourceType != ResourceType.Bonus }) {

fastlane/metadata/android/en-US/changelogs/767.txt

@@ -1,26 +1,4 @@
-
-
-Fixed json tests
-
-Fixed city state tests
-
-Added validations for city-state uniques
-
-Converted all era uniques to conditional uniques for city-states
-
-Removed old deprecated bits and pieces
-
-Removed old deprecated parts
-
-cityStateType no longer causes crash
-
-CityStateType overhaul!!!!
-
-CityStateType deprecation p1
-
-Added CityStateTypes into rulesets! Not in use yet
-
-Separated ruleset validation to its own file
+City State Type overhaul!
 
 Can now use `[stats]` unique to add happiness globally