diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties
index 6f80456b8b..cd8face1ba 100644
--- a/android/assets/jsons/translations/Afrikaans.properties
+++ b/android/assets/jsons/translations/Afrikaans.properties
@@ -3413,6 +3413,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -3559,6 +3567,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index f8d10835cc..758045547d 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -2001,6 +2001,14 @@ after adopting [policy] = depois de adotar [policy]
 before adopting [policy] = antes de adotar [policy]
 before founding a Pantheon = antes de fundar um Panteão
 after founding a Pantheon = depois de fundar um Panteão
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = se [buildingFilter] for construído
 with [resource] = com [resource]
 without [resource] = sem [resource]
@@ -2074,6 +2082,8 @@ upon founding a city = ao fundar uma cidade
 upon discovering a Natural Wonder = ao descobrir uma Maravilha Natural
 upon constructing [buildingFilter] = ao construir [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = ao construir [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = ao fundar um Panteão
 upon founding a Religion = ao fundar uma Religião
 upon enhancing a Religion = ao aprimorar uma Religião
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index 03244af870..3d640f6f3c 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -2964,6 +2964,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -3110,6 +3118,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties
index 3566a13b2d..d859418db9 100644
--- a/android/assets/jsons/translations/Catalan.properties
+++ b/android/assets/jsons/translations/Catalan.properties
@@ -2019,6 +2019,14 @@ after adopting [policy] = després d’adoptar [policy]
 before adopting [policy] = abans d’adoptar [policy]
 before founding a Pantheon = abans de fundar un panteó
 after founding a Pantheon = després de fundar un panteó
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = si [buildingFilter] està construït
 with [resource] = amb [resource]
 without [resource] = sense [resource]
@@ -2092,6 +2100,8 @@ upon founding a city = quan es funda una ciutat
 upon discovering a Natural Wonder = quan es descobreix una meravella de la naturalesa
 upon constructing [buildingFilter] = quan es construeix [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = quan es construeix [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = quan es funda un panteó
 upon founding a Religion = quan es funda una religió
 upon enhancing a Religion = quan es difon una religió
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index c58af47ce3..07f2df426b 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -2277,6 +2277,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -2377,6 +2385,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index 533d5ee1ae..b0e0eb680e 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -2166,6 +2166,14 @@ before adopting [policy] = voor adoptie van [policy]
 before founding a Pantheon = 
  # Requires translation!
 after founding a Pantheon = 
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = als [buildingFilter] is gebouwd
  # Requires translation!
 with [resource] = 
@@ -2286,6 +2294,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index 2858221d7a..77055f5a3a 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -3763,6 +3763,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -3909,6 +3917,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index f8c981311a..2975cfcef9 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -2035,6 +2035,14 @@ after adopting [policy] = pagkatapos ipagtibay ang [policy]
 before adopting [policy] = bago magtakda ng [policy]
 before founding a Pantheon = bago itatag ang isang Panteon
 after founding a Pantheon = pagkatapos itatag ang isang Panteon
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = kung itinayo ang [buildingFilter] 
 with [resource] = kasama ang [resource]
 without [resource] = kapag wala ang [resource]
@@ -2108,6 +2116,8 @@ upon founding a city = kapag nagtatatag ng isang lungsod
 upon discovering a Natural Wonder = kapag nakadiskubre ng isang Likas na Kamanghaan
 upon constructing [buildingFilter] = kapag nagtatayo ng [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = kapag nagtatayo ng [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = kapag nagtatatag ng isang Panteon
 upon founding a Religion = kapag nagtatatag ng isang Relihiyon
 upon enhancing a Religion = kapag nagpapabuti ng isang Relihiyon
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index 9715511e53..d27f0dee36 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -2926,6 +2926,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -3067,6 +3075,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index a30f502293..5b9a37ac2a 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -99,9 +99,7 @@ Requires at least one of the following: = Nécessite au moins un des éléments
 Requires all of the following: = Tous les éléments suivants sont requis :
 Leads to [techName] = Conduit à [techName]
 Leads to: = Conduit à :
- # Requires translation!
 Enables: = Active :
- # Requires translation!
 Disables: = Désactive :
 
 Current construction = Construction en cours
@@ -2003,6 +2001,14 @@ after adopting [policy] = après avoir adopté [policy]
 before adopting [policy] = avant d'adopter [policy]
 before founding a Pantheon = avant de fonder un Panthéon
 after founding a Pantheon = après avoir fondé un Panthéon
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = si [buildingFilter] est construit(e)
 with [resource] = avec [resource]
 without [resource] = sans [resource]
@@ -2076,6 +2082,8 @@ upon founding a city = en fondant une ville
 upon discovering a Natural Wonder = en découvrant une Merveille Naturelle
 upon constructing [buildingFilter] = en construisant [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = en construisant [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = en fondant un Panthéon
 upon founding a Religion = en fondant une Religion
 upon enhancing a Religion = en renforçant une Religion
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 12d3927d1d..d56fc26c2c 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -2003,6 +2003,14 @@ after adopting [policy] = nach dem Verabschieden von [policy]
 before adopting [policy] = vor dem Verabschieden von [policy]
 before founding a Pantheon = vor der Gründung eines Pantheons
 after founding a Pantheon = nach der Gründung eines Pantheons
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = wenn [buildingFilter] gebaut wurde
 with [resource] = mit [resource]
 without [resource] = ohne [resource]
@@ -2076,6 +2084,8 @@ upon founding a city = bei der Gründung einer Stadt
 upon discovering a Natural Wonder = bei der Entdeckung eines Naturwunders
 upon constructing [buildingFilter] = beim Bau von [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = beim Bau von [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = bei der Gründung eines Pantheons
 upon founding a Religion = bei der Gründung einer Religion
 upon enhancing a Religion = bei der Verbesserung einer Religion
diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties
index 1b02cd2f54..1104e68b01 100644
--- a/android/assets/jsons/translations/Greek.properties
+++ b/android/assets/jsons/translations/Greek.properties
@@ -3377,6 +3377,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -3522,6 +3530,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index faa1b5032b..b9d7787b31 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -2082,6 +2082,14 @@ before adopting [policy] = a(z) [policy] beiktatása előtt
 before founding a Pantheon = 
  # Requires translation!
 after founding a Pantheon = 
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = ha [buildingFilter] kész
  # Requires translation!
 with [resource] = 
@@ -2195,6 +2203,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index e65cd9b7ef..c14cd2cb63 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -2019,6 +2019,14 @@ after adopting [policy] = setelah menerapkan [policy]
 before adopting [policy] = sebelum menerapkan [policy]
 before founding a Pantheon = sebelum menemukan kepercayaan
 after founding a Pantheon = setelah menemukan kepercayaan
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = jika [buildingFilter] telah dibangun
 with [resource] = dengan [resource]
 without [resource] = tanpa [resource]
@@ -2092,6 +2100,8 @@ upon founding a city = saat mendirikan kota
 upon discovering a Natural Wonder = saat menemukan Keajaiban Alam
 upon constructing [buildingFilter] = saat membangun [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = saat membangun [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = saat mendirikan Kepercayaan
 upon founding a Religion = saat mendirikan Agama
 upon enhancing a Religion = saat memperkuat Agama
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index 1a196a468f..deec29f831 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -2008,6 +2008,14 @@ after adopting [policy] = quando adotti [policy]
 before adopting [policy] = prima di adottare [policy]
 before founding a Pantheon = prima di fondare un Pantheon
 after founding a Pantheon = dopo aver fondato un Pantheon
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = se [buildingFilter] è presente
 with [resource] = con [resource]
 without [resource] = senza [resource]
@@ -2081,6 +2089,8 @@ upon founding a city = quando fondi una città
 upon discovering a Natural Wonder = quando scopri una Meraviglia naturale
 upon constructing [buildingFilter] = quando costruisci [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = quando costruisci [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = quando fondi un Pantheon
 upon founding a Religion = quando fondi una Religione
 upon enhancing a Religion = quando potenzi una Religione
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index e5aa663e1d..4a2c6ee15f 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -2405,6 +2405,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -2527,6 +2535,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 266d7cecc0..143e4aebd0 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -2016,6 +2016,14 @@ after adopting [policy] = [policy] 채택 후
 before adopting [policy] = [policy] 채택 전
 before founding a Pantheon = 종교관 선택 전
 after founding a Pantheon = 종교관 선택 후
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = [buildingFilter]이 건설되었을때만
 with [resource] = [resource]이(가) 있는
 without [resource] = [resource]이(가) 없는
@@ -2089,6 +2097,8 @@ upon founding a city = 도시 건설 시
 upon discovering a Natural Wonder = 자연 불가사의 발견 시
 upon constructing [buildingFilter] = [buildingFilter] 건설 시
 upon constructing [buildingFilter] [cityFilter] = [cityFilter]에 [buildingFilter] 건설 시
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = 종교관 선택 시
 upon founding a Religion = 종교 창시 시
 upon enhancing a Religion = 종교 강화 시
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index 1ab2fd7e3b..a06016f3cc 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -2094,6 +2094,14 @@ before adopting [policy] = prieš priimant [policy]
 before founding a Pantheon = 
  # Requires translation!
 after founding a Pantheon = 
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = jei pastatyta(s): [buildingFilter]
 with [resource] = su: [resource]
 without [resource] = be: [resource]
@@ -2181,6 +2189,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index 34be1c3231..f8374e955c 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -2934,6 +2934,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -3079,6 +3087,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index 6dc074caa9..711aa6770c 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -3156,6 +3156,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -3301,6 +3309,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index 120e3b2fe8..662cf03b40 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -3085,6 +3085,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -3230,6 +3238,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index 037711a88a..b9c5e0fd82 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -2019,6 +2019,14 @@ after adopting [policy] = po przyjęciu ustroju → [policy]
 before adopting [policy] = jeśli wcześniej nie wybrano ustroju → [policy]
 before founding a Pantheon = przed założeniem Panteonu
 after founding a Pantheon = po założeniu Panteonu
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = jeśli ukończono [buildingFilter]
 with [resource] = z [resource]
 without [resource] = bez [resource]
@@ -2095,6 +2103,8 @@ upon founding a city = po założeniu miasta
 upon discovering a Natural Wonder = po odkryciu Cudu Natury
 upon constructing [buildingFilter] = po zbudowaniu [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = po zbudowaniu [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = po założeniu Panteonu
 upon founding a Religion = po założeniu religii
 upon enhancing a Religion = po rozszerzeniu religii
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index cca098781a..744d158e85 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -2202,6 +2202,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -2327,6 +2335,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index bb8ba68191..cd7c622168 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -2344,6 +2344,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -2469,6 +2477,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index 5199f5b95c..5f50d413eb 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -2085,6 +2085,14 @@ before adopting [policy] = до принятия: [policy]
 before founding a Pantheon = 
  # Requires translation!
 after founding a Pantheon = 
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = если построена [buildingFilter]
 with [resource] = с: [resource]
 without [resource] = без: [resource]
@@ -2172,6 +2180,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 569365bd38..0db2d3065f 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -2016,6 +2016,14 @@ after adopting [policy] = 在推行[policy]后
 before adopting [policy] = 在推行[policy]前
 before founding a Pantheon = 在建立万神殿之后
 after founding a Pantheon = 在建立万神殿之前
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = 如果该城市已建造[buildingFilter]
 with [resource] = 拥有[resource]的
 without [resource] = 未拥有[resource]的
@@ -2089,6 +2097,8 @@ upon founding a city = 建立一个城市时
 upon discovering a Natural Wonder = 发现自然奇观时
 upon constructing [buildingFilter] = 建造[buildingFilter]时
 upon constructing [buildingFilter] [cityFilter] = [cityFilter]建造[buildingFilter]时
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = 创建万神殿时
 upon founding a Religion = 创建宗教时
 upon enhancing a Religion = 强化宗教时
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index 84ae3e8839..01647b9571 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -99,9 +99,7 @@ Requires at least one of the following: = Requiere al menos uno de lo siguiente:
 Requires all of the following: = Requiere todo lo siguiente:
 Leads to [techName] = Lleva a [techName]
 Leads to: = Lleva a:
- # Requires translation!
 Enables: = Activa:
- # Requires translation!
 Disables: = Desactiva:
 
 Current construction = Construcción actual
@@ -2003,6 +2001,14 @@ after adopting [policy] = después de adoptar [policy]
 before adopting [policy] = antes de adoptar [policy]
 before founding a Pantheon = antes de fundar un Panteón
 after founding a Pantheon = después de fundar un Panteón
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = si [buildingFilter] está construido
 with [resource] = con [resource]
 without [resource] = sin [resource]
@@ -2076,6 +2082,8 @@ upon founding a city = al fundar una ciudad
 upon discovering a Natural Wonder = al descubrir una Maravilla Natural
 upon constructing [buildingFilter] = cuando se construya un [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = cuando se construya un [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = cuando de cree un Panteón
 upon founding a Religion = cuando se funde una Religión
 upon enhancing a Religion = cuando se realze una Religión
@@ -2242,7 +2250,6 @@ You have denounced our enemies = Has denunciado a nuestros enemigos
 Our open borders have brought us closer together. = Nuestras fronteras abiertas nos han unido.
 You fulfilled your promise to stop settling cities near us! = ¡Has cumplido tu promesa de no fundar ciudades cerca nuestro!
 You gave us units! = ¡Nos regalaste unidades!
- # Requires translation!
 We appreciate your gifts = Agradecemos sus regalos
 You returned captured units to us = Nos has devuelto unidades capturadas
 
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index fc91e74e82..d4ac8de744 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -2164,6 +2164,14 @@ before adopting [policy] = innan [policy] anammats
 before founding a Pantheon = 
  # Requires translation!
 after founding a Pantheon = 
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = om [buildingFilter] är byggt
 with [resource] = med [resource]
  # Requires translation!
@@ -2254,6 +2262,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index 856c0133b3..668f6dbc8e 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -2016,6 +2016,14 @@ after adopting [policy] = 在採用[policy]之後
 before adopting [policy] = 在採用[policy]之前
 before founding a Pantheon = 在建立萬神殿之前
 after founding a Pantheon = 在建立萬神殿之後
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = 如果[buildingFilter]已建造
 with [resource] = 擁有[resource]
 without [resource] = 未擁有[resource]
@@ -2089,6 +2097,8 @@ upon founding a city = 建立城市時
 upon discovering a Natural Wonder = 發現自然景觀時
 upon constructing [buildingFilter] = 建造[buildingFilter]時
 upon constructing [buildingFilter] [cityFilter] = [cityFilter]建造[buildingFilter]時
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = 創立神系時
 upon founding a Religion = 創立宗教時
 upon enhancing a Religion = 強化宗教時
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index cf06be1ed4..9203d9be10 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -2524,6 +2524,14 @@ before founding a Pantheon =
  # Requires translation!
 after founding a Pantheon = 
  # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
+ # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
 with [resource] = 
@@ -2655,6 +2663,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index f58e916302..343816cf92 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -2001,6 +2001,14 @@ after adopting [policy] = після прийняття [policy]
 before adopting [policy] = до прийняття [policy]
 before founding a Pantheon = перед заснуванням Пантеону
 after founding a Pantheon = після заснування Пантеону
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = якщо створено [buildingFilter]
 with [resource] = з [resource]
 without [resource] = без [resource]
@@ -2074,6 +2082,8 @@ upon founding a city = заснувавши місто
 upon discovering a Natural Wonder = після відкриття Природного дива
 upon constructing [buildingFilter] = побудувавши [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = побудувавши [buildingFilter] [cityFilter]
+ # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
 upon founding a Pantheon = заснувавши Пантеон
 upon founding a Religion = заснувавши Релігію
 upon enhancing a Religion = покращивши Релігію
diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties
index 1cdac211f4..225726e33d 100644
--- a/android/assets/jsons/translations/Vietnamese.properties
+++ b/android/assets/jsons/translations/Vietnamese.properties
@@ -2089,6 +2089,14 @@ after adopting [policy] = sau khi áp dụng [policy]
 before adopting [policy] = trước khi áp dụng [policy]
 before founding a Pantheon = trước khi thành lập một điện Pantheon
 after founding a Pantheon = sau khi thành lập điện Pantheon
+ # Requires translation!
+before founding a religion = 
+ # Requires translation!
+after founding a religion = 
+ # Requires translation!
+before enhancing a religion = 
+ # Requires translation!
+after enhancing a religion = 
 if [buildingFilter] is constructed = nếu [buildingFilter] được xây dựng
 with [resource] = với [resource]
 without [resource] = không có [resource]
@@ -2176,6 +2184,8 @@ upon constructing [buildingFilter] =
  # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = 
  # Requires translation!
+upon gaining a [baseUnitFilter] unit = 
+ # Requires translation!
 upon founding a Pantheon = 
  # Requires translation!
 upon founding a Religion = 
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index 41b57d17ba..50cce027d7 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -5,7 +5,7 @@ Afrikaans = 7
 German = 99
 Swedish = 89
 Turkish = 70
-Ukrainian = 100
+Ukrainian = 99
 Filipino = 96
 French = 99
 Portuguese = 65
diff --git a/changelog.md b/changelog.md
index 8e730cebcd..ac302e641b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,16 +1,13 @@
 ## 4.4.19
 
-chore: code cleanup
-
-Fix unique parameter type
-
-modding: Added "upon gaining a [unitFilter] unit" trigger condition
-
-chore: moved citiesConnectedToCapitalToMediums to cache
-
 By Gualdimar:
-- Limit camera movement within explored region 
-- Fixed world wrap coordinates check 
+- Limit camera movement within explored region
+
+modding:
+- Added "upon gaining a [unitFilter] unit" trigger condition
+- Added religion state conditionals
+
+Reload world screen after tileset/unitset change from in main menu screen - Ryg-git
 
 Android: use best possible device frame rate  - By vegeta1k95
 
diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md
index ce368e26a0..3eea533990 100644
--- a/docs/Modders/uniques.md
+++ b/docs/Modders/uniques.md
@@ -1730,6 +1730,18 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
 ??? example  "<after founding a Pantheon>"
 	Applicable to: Conditional
 
+??? example  "<before founding a religion>"
+	Applicable to: Conditional
+
+??? example  "<after founding a religion>"
+	Applicable to: Conditional
+
+??? example  "<before enhancing a religion>"
+	Applicable to: Conditional
+
+??? example  "<after enhancing a religion>"
+	Applicable to: Conditional
+
 ??? example  "<if [buildingFilter] is constructed>"
 	Example: "<if [Culture] is constructed>"
 
diff --git a/fastlane/metadata/android/en-US/changelogs/818.txt b/fastlane/metadata/android/en-US/changelogs/818.txt
index 7e4ab6c3de..bfabefab0a 100644
--- a/fastlane/metadata/android/en-US/changelogs/818.txt
+++ b/fastlane/metadata/android/en-US/changelogs/818.txt
@@ -1,16 +1,11 @@
-
-
-chore: code cleanup
-
-Fix unique parameter type
-
-modding: Added "upon gaining a [unitFilter] unit" trigger condition
-
-chore: moved citiesConnectedToCapitalToMediums to cache
-
 By Gualdimar:
-- Limit camera movement within explored region 
-- Fixed world wrap coordinates check 
+- Limit camera movement within explored region
+
+modding:
+- Added "upon gaining a [unitFilter] unit" trigger condition
+- Added religion state conditionals
+
+Reload world screen after tileset/unitset change from in main menu screen - Ryg-git
 
 Android: use best possible device frame rate  - By vegeta1k95