diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties
index 8cf590e686..0067ae05d5 100644
--- a/android/assets/jsons/translations/Afrikaans.properties
+++ b/android/assets/jsons/translations/Afrikaans.properties
@@ -364,6 +364,18 @@ Three Continents = Drie Vastelande
 Four Corners = Vier Hoeke
 Archipelago = Argipel
 Inner Sea = Binnesee
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Aantal Stadstate
 One City Challenge = Een Stad Uitdaging
 No City Razing = Geen Stadsverwoesting
@@ -8519,10 +8531,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -10718,6 +10726,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -10736,6 +10746,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index c12c2608b6..d94e431046 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -360,6 +360,18 @@ Three Continents = Três Continentes
 Four Corners = Quatro Cantos
 Archipelago = Arquipélago
 Inner Sea = Mar interno
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Número de cidades-estado
 One City Challenge = Desafio - Apenas Uma Cidade
 No City Razing = Sem queimar cidade
@@ -4937,8 +4949,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Sun
-upon entering the [era] = ao entrar na [era]
-Gain [amount] [stat] = Ganhe [amount] [stat]
 
 Refaat = Refaat
 Heba = Heba
@@ -6138,6 +6148,7 @@ Free [baseUnitFilter] found in the ruins = [baseUnitFilter] grátis encontrado n
 [amount] population in a random city = [amount] de população em uma cidade aleatória
 [amount] free random researchable Tech(s) from the [era] = [amount] de tecnologia(s) pesquisável(es) aleatória(s) gratuita(s) da [era]
 Gain a free [beliefType] belief = Ganhe uma crença [beliefType] gratuita
+Gain [amount] [stat] = Ganhe [amount] [stat]
 Gain [amount]-[amount2] [stat] = Ganhe [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Ganhe fé suficiente para um Panteão
 Gain enough Faith for [amount]% of a Great Prophet = Ganhe Fé suficiente para [amount]% de um Grande Profeta
@@ -6147,6 +6158,7 @@ This Unit gains [amount] XP = Esta Unidade recebe [amount] de XP
 This Unit upgrades for free including special upgrades = Esta Unidade melhora de graça incluindo aprimoramentos especiais
 This Unit gains the [promotion] promotion = Esta Unidade ganha a promoção [promotion]
 upon discovering [tech] = ao descobrir [tech]
+upon entering the [era] = ao entrar na [era]
 upon adopting [policy] = ao adotar [policy]
 upon declaring war with a major Civilization = ao declarar guerra com uma principal civilização
 upon declaring friendship = ao declarar amizade
@@ -6178,6 +6190,7 @@ Tutorial = Tutorial
 CityState = Cidade-Estado
 ModOptions = Opções de Mod
 Conditional = Condicional
+ # Requires translation!
 TriggerCondition = 
 EstablishNetwork = EstabelecerRede
 StealingTech = RoubarTecnologia
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index c696f90d56..c0c8435ecf 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -426,6 +426,18 @@ Archipelago = Острови
  # Requires translation!
 Inner Sea = 
  # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
+ # Requires translation!
 Number of City-States = 
 One City Challenge = Предизвикателство Един Град
  # Requires translation!
@@ -7948,10 +7960,6 @@ Wu = Ву
  # Requires translation!
 Zhou = 
 Sun = Сун
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -10032,6 +10040,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -10050,6 +10060,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties
index 7e3fbe6880..5414cdac32 100644
--- a/android/assets/jsons/translations/Catalan.properties
+++ b/android/assets/jsons/translations/Catalan.properties
@@ -360,6 +360,18 @@ Three Continents = Tres continents
 Four Corners = Quatre cantonades
 Archipelago = Arxipèlag
 Inner Sea = Mar interior
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Nombre de ciutats-estat
 One City Challenge = Repte d’una sola ciutat
 No City Razing = Les ciutats no es poden arrasar
@@ -4937,8 +4949,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Sun
-upon entering the [era] = quan s'entri a l’[era]
-Gain [amount] [stat] = Guanya [amount] [stat]
 
 Refaat = Refaat
 Heba = Heba
@@ -6138,6 +6148,7 @@ Free [baseUnitFilter] found in the ruins = s’ha trobat un [baseUnitFilter] de
 [amount] population in a random city = [amount] de població en una ciutat aleatòria
 [amount] free random researchable Tech(s) from the [era] = [amount] tecnologies aleatòries de franc de l’[era]
 Gain a free [beliefType] belief = Obtén una creença [beliefType]
+Gain [amount] [stat] = Guanya [amount] [stat]
 Gain [amount]-[amount2] [stat] = Guanya [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Guanya prou fe per un panteó
 Gain enough Faith for [amount]% of a Great Prophet = Guanya prou fe per [amount] % d’un gran profeta
@@ -6147,6 +6158,7 @@ This Unit gains [amount] XP = Aquesta unitat guanya [amount] d’experiència
 This Unit upgrades for free including special upgrades = Aquesta unitat millora de franc, incloses les millores especials.
 This Unit gains the [promotion] promotion = Aquesta unitat guanya l’ascens [promotion].
 upon discovering [tech] = quan es descobreix [tech]
+upon entering the [era] = quan s'entri a l’[era]
 upon adopting [policy] = quan s’adopta [policy]
 upon declaring war with a major Civilization = quan es declara la guerra a una civilització gran
 upon declaring friendship = quan es declara amistat
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 22a23a3df8..2d7b1fa071 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -370,6 +370,18 @@ Three Continents =
 Four Corners = Čtyři rohy
 Archipelago = Souostroví
 Inner Sea = Vnitřní moře
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Počet městských států
 One City Challenge = Výzva - Jen jedno město
  # Requires translation!
@@ -5364,9 +5376,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = Získat [amount] [stat]
 
  # Requires translation!
 Refaat = 
@@ -6966,6 +6975,7 @@ Free [baseUnitFilter] found in the ruins = V ruinách byla nalezena jednotka [ba
 [amount] free random researchable Tech(s) from the [era] = [amount] nahodných výzkumů z éry [era] zdarma
  # Requires translation!
 Gain a free [beliefType] belief = 
+Gain [amount] [stat] = Získat [amount] [stat]
 Gain [amount]-[amount2] [stat] = Získat [amount]-[amount2] [stat]
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -6979,6 +6989,8 @@ This Unit gains the [promotion] promotion = Tato jednotka získá povýšení [p
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index 28dad06bc8..64d44e9cf7 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -370,6 +370,18 @@ Three Continents =
 Four Corners = Vier hoeken
 Archipelago = Archipel
 Inner Sea = Binnenzee
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Hoeveelheid Stadstaten
 One City Challenge = Eén-staduitdaging
  # Requires translation!
@@ -5741,10 +5753,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -7903,6 +7911,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -7921,6 +7931,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index 1b2cd23d4b..f73deb16b0 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -651,6 +651,18 @@ Archipelago =
  # Requires translation!
 Inner Sea = 
  # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
+ # Requires translation!
 Number of City-States = 
  # Requires translation!
 One City Challenge = 
@@ -8894,10 +8906,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -11093,6 +11101,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -11111,6 +11121,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index 1edb29cf87..17b0762764 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -365,6 +365,18 @@ Three Continents = Tatlong Kontinente
 Four Corners = Apat na Sulok
 Archipelago = Kapuluan
 Inner Sea = Panloob na Dagat
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Bilang ng mga Lungsod-Estado
 One City Challenge = Isang Lungsod na Hamon
 No City Razing = Walang Pagwasak ng Lungsod
@@ -4952,9 +4964,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Sun
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = Kumuha ng [amount] [stat] 
 
 Refaat = Refaat
 Heba = Heba
@@ -6288,6 +6297,7 @@ Free [baseUnitFilter] found in the ruins = Libreng [baseUnitFilter] matatagpuan
 [amount] population in a random city = [amount] population sa isang di-matukoy na lungsod
 [amount] free random researchable Tech(s) from the [era] = [amount] libreng di matukoy na pwedeng masaliksik na (mga) Teknolohiya mula sa [era]
 Gain a free [beliefType] belief = Kumuha ng libreng [beliefType] na paniniwala
+Gain [amount] [stat] = Kumuha ng [amount] [stat] 
 Gain [amount]-[amount2] [stat] = Kumuha ng [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Kumuha ng sapat na Pananalig para sa isang Panteon
 Gain enough Faith for [amount]% of a Great Prophet = Kumuha ng sapat na Pananalig para sa [amount]% ng isang Dakilang Propeta
@@ -6299,6 +6309,8 @@ This Unit gains the [promotion] promotion = Itong Yunit ay tatanggap ng [promoti
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index 14768ab0ea..6f32bf869a 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -417,6 +417,18 @@ Four Corners = Nelikulmainen
 Archipelago = Saaristo
  # Requires translation!
 Inner Sea = 
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Kaupunkivaltioiden määrä
 One City Challenge = Yhden kaupungin haaste
  # Requires translation!
@@ -6969,10 +6981,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -9158,6 +9166,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -9176,6 +9186,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 77731457e7..f5b1a80f7f 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -360,6 +360,18 @@ Three Continents = Trois continents
 Four Corners = Quatre coins
 Archipelago = Archipel
 Inner Sea = Mer intérieure
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Nombre de Cités-États
 One City Challenge = Défi Ville unique
 No City Razing = Impossible de raser les villes
@@ -4937,9 +4949,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Sun
- # Requires translation!
-upon entering the [era] = en entrant dans [era]
-Gain [amount] [stat] = Gagne [amount] [stat]
 
 Refaat = Refaat
 Heba = Heba
@@ -6139,6 +6148,7 @@ Free [baseUnitFilter] found in the ruins = [baseUnitFilter] gratuit(e) trouvé(e
 [amount] population in a random city = [amount] Population dans une ville aléatoire
 [amount] free random researchable Tech(s) from the [era] = [amount] technologie(s) gratuite(s) aléatoire(s) disponible(s) pour [era]
 Gain a free [beliefType] belief = Gagner une croyance [beliefType] gratuite
+Gain [amount] [stat] = Gagne [amount] [stat]
 Gain [amount]-[amount2] [stat] = Gagner [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Gagner assez de Foi pour un Panthéon
 Gain enough Faith for [amount]% of a Great Prophet = Gagner assez de Foi pour [amount]% d'un Grand Prophète
@@ -6147,27 +6157,17 @@ From a randomly chosen tile [amount] tiles away from the ruins, reveal tiles up
 This Unit gains [amount] XP = Cette unité gagne [amount] XP
 This Unit upgrades for free including special upgrades = Cette Unité s'améliore gratuitement, améliorations spéciales comprises
 This Unit gains the [promotion] promotion = Cette Unité gagne la promotion [promotion]
- # Requires translation!
 upon discovering [tech] = en découvrant [tech]
- # Requires translation!
+upon entering the [era] = en entrant dans [era]
 upon adopting [policy] = en adoptant [policy]
- # Requires translation!
 upon declaring war with a major Civilization = en déclarant la guerre à une civilisation majeure
- # Requires translation!
 upon declaring friendship = en signant une déclaration d'amitié
- # Requires translation!
 upon entering a Golden Age = en entrant dans un Âge d'Or
- # Requires translation!
 upon conquering a city = en conquérant une ville
- # Requires translation!
 upon constructing [buildingFilter] = en construisant [buildingFilter]
- # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = en construisant [buildingFilter] [cityFilter]
- # Requires translation!
 upon founding a Pantheon = en fondant un Panthéon
- # Requires translation!
 upon founding a Religion = en fondant une Religion
- # Requires translation!
 upon enhancing a Religion = en renforçant une Religion
 Hidden after generating a Great Prophet = Caché après avoir généré un Grand Prophète
 Triggerable = Déclenchable
@@ -6190,7 +6190,6 @@ Tutorial = Tutoriel
 CityState = Cité-État
 ModOptions = Options Mod
 Conditional = Conditionnel
- # Requires translation!
 TriggerCondition = DéclencherCondition
 EstablishNetwork = ÉtablirRéseau
 StealingTech = VolerTechnologie
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 360201595b..d793856aaf 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -360,6 +360,18 @@ Three Continents = Drei Kontinente
 Four Corners = Vier Ecken
 Archipelago = Archipele
 Inner Sea = Binnenmeer
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Anzahl Stadtstaaten
 One City Challenge = Herausforderung nur eine Stadt
 No City Razing = Kein Niederreißen von Städten
@@ -4937,8 +4949,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Sun
-upon entering the [era] = beim Eintritt in [era]
-Gain [amount] [stat] = Erhalte [amount] [stat]
 
 Refaat = Refaat
 Heba = Heba
@@ -6138,6 +6148,7 @@ Free [baseUnitFilter] found in the ruins = Kostenlose [baseUnitFilter] Einheiz i
 [amount] population in a random city = [amount] Bevölkerung in einer zufälligen Stadt
 [amount] free random researchable Tech(s) from the [era] = [amount] freie zufällige Technologie aus dem Zeitalter [era]
 Gain a free [beliefType] belief = Erhalte einen kostenlosen [beliefType] Glauben
+Gain [amount] [stat] = Erhalte [amount] [stat]
 Gain [amount]-[amount2] [stat] = Erhalte [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Erhalte genug Glaube für ein Pantheon
 Gain enough Faith for [amount]% of a Great Prophet = Erhalte genug Glaube für [amount]% eines Großen Propheten
@@ -6147,6 +6158,7 @@ This Unit gains [amount] XP = Die Einheit erhält [amount] EP
 This Unit upgrades for free including special upgrades = Diese Einheit wird kostenlos aufgerüstet, einschließlich Spezialaufrüstungen
 This Unit gains the [promotion] promotion = Diese Einheit erhält die [promotion]-Beförderung
 upon discovering [tech] = bei der Entdeckung von [tech]
+upon entering the [era] = beim Eintritt in [era]
 upon adopting [policy] = bei der Verabschiedung von [policy]
 upon declaring war with a major Civilization = bei der Kriegserklärung gegen eine größere Zivilisation
 upon declaring friendship = bei der Freundschaftserklärung
diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties
index 54daf528b0..11c5e515ff 100644
--- a/android/assets/jsons/translations/Greek.properties
+++ b/android/assets/jsons/translations/Greek.properties
@@ -511,6 +511,18 @@ Three Continents =
 Four Corners = Τέσσερεις γωνίες 
 Archipelago = Αρχιπέλαγο
 Inner Sea = Εσωτερική θάλασσα
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Αριθμός πόλεων-κρατών
 One City Challenge = Πρόκληση μίας πόλεως
  # Requires translation!
@@ -8106,10 +8118,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -10304,6 +10312,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -10322,6 +10332,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 415119742f..085186e5d4 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -29,9 +29,7 @@ Fastlane_full_description = Minden idők leghíresebb civilizációépítő ját
 Delete = Törlés
 
 # Base ruleset names
- # Requires translation!
 Civ V - Vanilla = Civ V - alapjáték
- # Requires translation!
 Civ V - Gods & Kings = Civ V - Gods & Kings
 
 # Tutorial tasks
@@ -432,6 +430,18 @@ Three Continents = Három Földrész
 Four Corners = Négy Sarok
 Archipelago = Szigetcsoport
 Inner Sea = Belső Tenger
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Városállamok száma
 One City Challenge = Egy városos kihívás
  # Requires translation!
@@ -6439,10 +6449,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -8547,6 +8553,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -8565,6 +8573,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 3a015eeb67..32d1834d76 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -363,6 +363,18 @@ Three Continents = Tiga Benua
 Four Corners = Empat Penjuru
 Archipelago = Kepulauan
 Inner Sea = Laut Pedalaman
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Jumlah Negara-Kota
 One City Challenge = Tantangan Satu(1) Kota
 No City Razing = Tanpa Peruntuhan Kota
@@ -4949,9 +4961,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Sun
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = Memperoleh [amount] [stat]
 
 Refaat = Refaat
 Heba = Heba
@@ -6153,6 +6162,7 @@ Free [baseUnitFilter] found in the ruins = [baseUnitFilter] gratis ditemukan di
 [amount] population in a random city = [amount] populasi di kota acak
 [amount] free random researchable Tech(s) from the [era] = gratis [amount] teknologi acak yang dapat diteliti dari [era]
 Gain a free [beliefType] belief = Mendapatkan kepercayaan [beliefType] gratis
+Gain [amount] [stat] = Memperoleh [amount] [stat]
 Gain [amount]-[amount2] [stat] = Memperoleh [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Mendapatkan keyakinan yang cukup untuk membuat Kepercayaan
 Gain enough Faith for [amount]% of a Great Prophet = Mendapatkan keyakinan yang cukup untuk [amount]% dari Nabi
@@ -6164,6 +6174,8 @@ This Unit gains the [promotion] promotion = Unit ini memperoleh promosi [promoti
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index 9892cf42f1..208b0cd810 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -363,6 +363,18 @@ Three Continents = Tre continenti
 Four Corners = Quattro angoli
 Archipelago = Arcipelago
 Inner Sea = Mare interno
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Numero di Città-Stato
 One City Challenge = Sfida a città singola
 No City Razing = Nessuna razzia
@@ -4952,8 +4964,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Sun
-upon entering the [era] = quando entri nell'[era]
-Gain [amount] [stat] = Ottieni [amount] [stat]
 
 Refaat = Refaat
 Heba = Heba
@@ -6153,6 +6163,7 @@ Free [baseUnitFilter] found in the ruins = Unità [baseUnitFilter] gratuita trov
 [amount] population in a random city = [amount] abitanti in una città casuale
 [amount] free random researchable Tech(s) from the [era] = [amount] tecnologie casuali ricercabili dall'[era]
 Gain a free [beliefType] belief = Ottieni una credenza gratuita [beliefType]
+Gain [amount] [stat] = Ottieni [amount] [stat]
 Gain [amount]-[amount2] [stat] = Ottieni [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Ottieni abbastanza fede per un Pantheon
 Gain enough Faith for [amount]% of a Great Prophet = Ottieni abbastanza Fede per il [amount]% di un Grande Profeta
@@ -6162,6 +6173,7 @@ This Unit gains [amount] XP = L'unità ottiene [amount] XP
 This Unit upgrades for free including special upgrades = L'unità viene aggiornata gratuitamente con tutti i suoi aggiornamenti speciali
 This Unit gains the [promotion] promotion = L'unità ottiene la promozione [promotion]
 upon discovering [tech] = quando scopri [tech]
+upon entering the [era] = quando entri nell'[era]
 upon adopting [policy] = quando adotti [policy]
 upon declaring war with a major Civilization = quando dichiari guerra a un'altra civiltà
 upon declaring friendship = quando fai una Dichiarazione d'Amicizia
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index d64c85f8d4..28fdf54ec8 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -366,6 +366,18 @@ Three Continents = 三大陸
 Four Corners = 四大陸
 Archipelago = 多島海
 Inner Sea = 内海
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = 都市国家の数
 One City Challenge = ワンシティチャレンジ
  # Requires translation!
@@ -5476,10 +5488,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -7498,6 +7506,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -7516,6 +7526,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 0ee0f05b40..b2d292be97 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -360,6 +360,18 @@ Three Continents = 삼대륙
 Four Corners = 사합점
 Archipelago = 군도
 Inner Sea = 내해
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = 도시 국가 수
 One City Challenge = 단일 도시 도전
 No City Razing = 도시 파괴 불가
@@ -4937,9 +4949,6 @@ Zhao = 조
 Wu = 무
 Zhou = 저우
 Sun = 쑨
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = [amount] [stat] 획득
 
 Refaat = 리파트
 Heba = 헤바
@@ -6139,6 +6148,7 @@ Free [baseUnitFilter] found in the ruins = 고대 유적에서 [baseUnitFilter]
 [amount] population in a random city = 임의의 도시에 인구 [amount] 추가
 [amount] free random researchable Tech(s) from the [era] = [era]의 연구 가능한 임의의 기술 중 [amount]개 무료
 Gain a free [beliefType] belief = 무료 [beliefType] 교리 획득
+Gain [amount] [stat] = [amount] [stat] 획득
 Gain [amount]-[amount2] [stat] = [amount]~[amount2] [stat] 획득
 Gain enough Faith for a Pantheon = 종교관 선택에 필요한 신앙 획득
 Gain enough Faith for [amount]% of a Great Prophet = 위대한 선지자 획득에 필요한 신앙의 [amount]% 획득
@@ -6150,6 +6160,8 @@ This Unit gains the [promotion] promotion = 유닛이 [promotion] 승급 획득
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index e66a0f5648..14777dfe71 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -368,6 +368,18 @@ Three Continents =
 Four Corners = Keturi Kampai
 Archipelago = Archipelagai
 Inner Sea = Vidinė jūra
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Laisvųjų miestų kiekis
 One City Challenge = Vieno miesto iššūkis
  # Requires translation!
@@ -4987,9 +4999,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Sun
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = Duoda: [amount] [stat]
 
 Refaat = Refaat
 Heba = Heba
@@ -6199,6 +6208,7 @@ Free [baseUnitFilter] found in the ruins = Įgijome: [baseUnitFilter] surastą g
 [amount] population in a random city = [amount] gyventojų bet kuriam miestui
 [amount] free random researchable Tech(s) from the [era] = [amount] bet kurių galimų tyrimams technologijų dovanai iš eros: [era]
 Gain a free [beliefType] belief = Įgyjam: [beliefType] tikėjimą dovanai
+Gain [amount] [stat] = Duoda: [amount] [stat]
 Gain [amount]-[amount2] [stat] = Duoda: [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Duoda pakankamai Tikėjimo panteonui
 Gain enough Faith for [amount]% of a Great Prophet = Duoda pakankamai Tikėjimo gauti [amount]% Didžiojo pranašo atėjimui
@@ -6210,6 +6220,8 @@ This Unit gains the [promotion] promotion = Šis dalinys gauna paaukštinimą: [
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index 509942c2a1..368b9b7508 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -458,6 +458,18 @@ Four Corners = Empat Penjuru
 Archipelago = Kepulauan
  # Requires translation!
 Inner Sea = 
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Jumlah Negara Kota
 One City Challenge = Cabaran Bandar Tunggal
  # Requires translation!
@@ -7702,10 +7714,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -9887,6 +9895,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -9905,6 +9915,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index c4c4ab7383..1fe329a759 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -494,6 +494,18 @@ Four Corners =
 Archipelago = Majma’ol Jazāyer
  # Requires translation!
 Inner Sea = 
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Tedād e Šahrestān hā
 One City Challenge = Čāleš tak šahri
  # Requires translation!
@@ -8199,10 +8211,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -10393,6 +10401,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -10411,6 +10421,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index 160837daf7..3ec0c03fcb 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -446,6 +446,18 @@ Four Corners = Chahar Gosheh
 Archipelago = Majma’ol Jazaayer
  # Requires translation!
 Inner Sea = 
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Tedaad e Shahrestaan haa
 One City Challenge = Chaalesh tak shahri
  # Requires translation!
@@ -8124,10 +8136,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -10318,6 +10326,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -10336,6 +10346,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index c63e1cb569..59c36bf781 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -367,6 +367,18 @@ Three Continents =
 Four Corners = Cztery krańce
 Archipelago = Archipelag
 Inner Sea = Morze wewnętrzne
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Ilość Wolnych Miast
 One City Challenge = Wyzwanie jednego miasta
  # Requires translation!
@@ -4976,9 +4988,6 @@ Zhao = Czao
 Wu = Wu
 Zhou = Czou
 Sun = Sun
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = Zdobądź [amount] [stat]
 
 Refaat = Refaat
 Heba = Heba
@@ -6184,6 +6193,7 @@ Free [baseUnitFilter] found in the ruins = Bezpłatna jednostka [baseUnitFilter]
 [amount] population in a random city = [amount] populacji w losowym mieście
 [amount] free random researchable Tech(s) from the [era] = [amount] bezpłatnych losowych technologii z: [era]
 Gain a free [beliefType] belief = Zdobądź darmowe wierzenie [beliefType]
+Gain [amount] [stat] = Zdobądź [amount] [stat]
 Gain [amount]-[amount2] [stat] = Zdobądź [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Zdobądź wystarczającą ilość Wiary dla Panteonu
 Gain enough Faith for [amount]% of a Great Prophet = Zdobądź wystarczającą ilość Wiary za [amount]% Wielkiego Proroka
@@ -6195,6 +6205,8 @@ This Unit gains the [promotion] promotion = Ta jednostka uzyskała awans [promot
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index a83acc314f..70ae6f4807 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -409,6 +409,18 @@ Four Corners = Quatro Cantos
 Archipelago = Arquipélago
  # Requires translation!
 Inner Sea = 
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Número de cidades-estado
 One City Challenge = Desafio - Apenas Uma Cidade
  # Requires translation!
@@ -6427,10 +6439,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -8505,6 +8513,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -8523,6 +8533,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index 471c769935..70a3491def 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -371,6 +371,18 @@ Three Continents =
 Four Corners = Patru Colțuri
 Archipelago = Arhipeleag
 Inner Sea = Mare interioară
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Numărul de orașe-stat
 One City Challenge = Provocare cu un oraș
  # Requires translation!
@@ -5430,10 +5442,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -7301,6 +7309,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -7319,6 +7329,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index 93a215d9aa..40fe483c5b 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -368,6 +368,18 @@ Three Continents =
 Four Corners = Четыре Угла
 Archipelago = Архипелаги
 Inner Sea = Внутреннее Море
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Число городов-государств
 One City Challenge = Испытание одного города
  # Requires translation!
@@ -4986,9 +4998,6 @@ Zhao = Чжао
 Wu = У
 Zhou = Чу
 Sun = Сунь
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = Даёт [amount] [stat]
 
 Refaat = Рефат
 Heba = Хеба
@@ -6198,6 +6207,7 @@ Free [baseUnitFilter] found in the ruins = Бесплатный юнит: [baseU
 [amount] population in a random city = [amount] населения в случайном городе
 [amount] free random researchable Tech(s) from the [era] = [amount] бесплатных случайных технологий из эпохи [era]
 Gain a free [beliefType] belief = Даёт бесплатное верование: [beliefType]
+Gain [amount] [stat] = Даёт [amount] [stat]
 Gain [amount]-[amount2] [stat] = Даёт [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Даёт очки веры, достаточных для пантеона
 Gain enough Faith for [amount]% of a Great Prophet = Даёт очки веры, достаточных для [amount]% Великого пророка
@@ -6209,6 +6219,8 @@ This Unit gains the [promotion] promotion = Этот юнит получает 
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index e5f357b9a4..28fe8ee5de 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -360,6 +360,18 @@ Three Continents = 三个大洲
 Four Corners = 四岛
 Archipelago = 群岛
 Inner Sea = 内海
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = 城邦数量
 One City Challenge = 单城市挑战
 No City Razing = 禁止摧毁城市
@@ -4937,8 +4949,6 @@ Zhao = 赵
 Wu = 吴
 Zhou = 周
 Sun = 孙
-upon entering the [era] = 进入[era]时
-Gain [amount] [stat] = 获得[amount][stat]
 
 Refaat = 里法特
 Heba = 赫巴
@@ -6138,6 +6148,7 @@ Free [baseUnitFilter] found in the ruins = 免费获得在遗迹中发现[baseUn
 [amount] population in a random city = 在一个随机城市中增加[amount]人口
 [amount] free random researchable Tech(s) from the [era] = 免费获得[era]的[amount]个可研究科技
 Gain a free [beliefType] belief = 获得免费的[beliefType]信仰
+Gain [amount] [stat] = 获得[amount][stat]
 Gain [amount]-[amount2] [stat] = 获得[amount]-[amount2][stat]
 Gain enough Faith for a Pantheon = 为万神殿获得足够的信仰
 Gain enough Faith for [amount]% of a Great Prophet = 获得足够一个大先知的[amount]%的信仰
@@ -6147,13 +6158,14 @@ This Unit gains [amount] XP = 该单位获得[amount]经验
 This Unit upgrades for free including special upgrades = 该单位免费晋升，包括特殊晋升
 This Unit gains the [promotion] promotion = 该单位获得[promotion]晋升
 upon discovering [tech] = 研究[tech]时
+upon entering the [era] = 进入[era]时
 upon adopting [policy] = 推行[policy]时
 upon declaring war with a major Civilization = 向主要文明宣战时
 upon declaring friendship = 宣布友谊宣言时
 upon entering a Golden Age = 进入黄金时代时
 upon conquering a city = 占领一个城市时
 upon constructing [buildingFilter] = 建造[buildingFilter]时
-upon constructing [buildingFilter] [cityFilter] = [ciyFilter]建造[buildingFilter]时
+upon constructing [buildingFilter] [cityFilter] = [cityFilter]建造[buildingFilter]时
 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 7db8106698..1ae2321f71 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -360,6 +360,18 @@ Three Continents = Tres Continentes
 Four Corners = Cuatro Esquinas
 Archipelago = Archipiélago
 Inner Sea = Mar Interior
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Número de Ciudades-Estado
 One City Challenge = Reto de Una Sola Ciudad
 No City Razing = Sin Arrasar Ciudades
@@ -946,9 +958,7 @@ Add in capital = Añadir a la capital
 Add to [comment] = Añadir a [comment]
 Upgrade to [unitType] ([goldCost] gold) = Mejorar a [unitType] ([goldCost] oro)
 Upgrade to [unitType]\n([goldCost] gold, [resources]) = Mejorar a [unitType]\n([goldCost] oro, [resources])
- # Requires translation!
 Transform to [unitType] = Convertir en [unitType]
- # Requires translation!
 Transform to [unitType]\n([resources]) = Convertir en [unitType]\n([resources])
 Found city = Fundar ciudad
 Promote = Ascender
@@ -1334,7 +1344,6 @@ Can upgrade from [unit] = Puede mejorarse desde [unit]
 Can upgrade from: = Puede mejorarse desde:
 Upgrades to [upgradedUnit] = Mejora a [upgradedUnit]
 Obsolete with [obsoleteTech] = Obsoleto con [obsoleteTech]
- # Requires translation!
 Can Transform to [upgradedUnit] = Puede Convertirse en [upgradedUnit]
 Occurs on [listOfTerrains] = Aparece en [listOfTerrains]
 Occurs on: = Aparece en:
@@ -4940,9 +4949,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Sun
- # Requires translation!
-upon entering the [era] = cuando se entre en la [era]
-Gain [amount] [stat] = Ganar [amount] [stat]
 
 Refaat = Refaat
 Heba = Heba
@@ -6109,7 +6115,6 @@ Destroys tile improvements when attacking = Destruye mejoras de casilla al ataca
 Cannot move = No se puede mover
 [amount] Movement point cost to embark = [amount] al coste de puntos de Movimiento para embarcar
 Can speed up the construction of a wonder = Puede acelerar la construcción de una maravilla
- # Requires translation!
 Can transform to [unit] = Puede convertirse en [unit]
 Costs [amount] gold per turn when in your territory = Cuesta [amount] ¤Oro por ⏳turno si está en tu territorio
 by consuming this unit = al consumar esta unidad
@@ -6143,6 +6148,7 @@ Free [baseUnitFilter] found in the ruins = Gratis [baseUnitFilter] encontrado en
 [amount] population in a random city = [amount] población en una ciudad aleatoria
 [amount] free random researchable Tech(s) from the [era] = [amount] tecnología aleatoria gratis de la era [era]
 Gain a free [beliefType] belief = Gana una creencia [beliefType] gratis
+Gain [amount] [stat] = Ganar [amount] [stat]
 Gain [amount]-[amount2] [stat] = Ganar [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Gana suficiente fe para un panteón
 Gain enough Faith for [amount]% of a Great Prophet = Obtenga suficiente Fé para [amount]% de un Gran Profeta
@@ -6151,27 +6157,17 @@ From a randomly chosen tile [amount] tiles away from the ruins, reveal tiles up
 This Unit gains [amount] XP = Esta Unidad gana [amount] EXP
 This Unit upgrades for free including special upgrades = Esta unidad se actualiza de forma gratuita, incluidas las actualizaciones especiales
 This Unit gains the [promotion] promotion = Esta Unidad gana la [promotion] promoción
- # Requires translation!
 upon discovering [tech] = cuando se descubre [tech]
- # Requires translation!
+upon entering the [era] = cuando se entre en la [era]
 upon adopting [policy] = cuando se adopta [policy]
- # Requires translation!
 upon declaring war with a major Civilization = cuando se declara la guerra a una Civ principal
- # Requires translation!
 upon declaring friendship = cuando se declara amistad
- # Requires translation!
 upon entering a Golden Age = cuando se entra en una Edad Dorada
- # Requires translation!
 upon conquering a city = cuando se conquista una ciudad
- # Requires translation!
 upon constructing [buildingFilter] = cuando se construya un [buildingFilter]
- # Requires translation!
 upon constructing [buildingFilter] [cityFilter] = cuando se construya un [buildingFilter] [cityFilter]
- # Requires translation!
 upon founding a Pantheon = cuando de cree un Panteón
- # Requires translation!
 upon founding a Religion = cuando se funde una Religión
- # Requires translation!
 upon enhancing a Religion = cuando se realze una Religión
 Hidden after generating a Great Prophet = Oculto después de generar un gran profeta
 Triggerable = Activable
@@ -6194,7 +6190,6 @@ Tutorial = Tuturial
 CityState = ciudad-estado
 ModOptions = Opciones de mod
 Conditional = Condicional
- # Requires translation!
 TriggerCondition = Condición Gatillo
 EstablishNetwork = Establecer Conección
 StealingTech = Robar Tecnología
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index 8d2cee95be..d76459fbf6 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -372,6 +372,18 @@ Three Continents =
 Four Corners = Fyra hörnor
 Archipelago = Skärgård
 Inner Sea = Innanhav
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Antal Statsstater
 One City Challenge = Enstadsutmaning
  # Requires translation!
@@ -5085,9 +5097,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = Få [amount] [stat]
 
  # Requires translation!
 Refaat = 
@@ -6617,6 +6626,7 @@ Free [baseUnitFilter] found in the ruins = Gratis [baseUnitFilter] hittad i ruin
 [amount] free random researchable Tech(s) from the [era] = [amount] gratis slumpmässiga forskningsbara Teknologi(er) från [era]
  # Requires translation!
 Gain a free [beliefType] belief = 
+Gain [amount] [stat] = Få [amount] [stat]
 Gain [amount]-[amount2] [stat] = Få [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Få tillräckligt med Tro för ett Panteon
 Gain enough Faith for [amount]% of a Great Prophet = Få tillräckligt med Tro för [amount]% av en Stor Profet
@@ -6628,6 +6638,8 @@ This Unit gains the [promotion] promotion = Denna Enhet får [promotion]-befordr
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index 5ded6e986f..fc5359aa8b 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -360,6 +360,18 @@ Three Continents = 三島
 Four Corners = 四島
 Archipelago = 群島
 Inner Sea = 內海
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = 城邦數量
 One City Challenge = 單城市挑戰
 No City Razing = 禁止摧毀城市
@@ -4942,9 +4954,6 @@ Zhao = 趙
 Wu = 吳
 Zhou = 周
 Sun = 孫
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = 獲得 [amount] [stat]
 
 Refaat = 雷法特
 Heba = 赫芭，
@@ -6145,6 +6154,7 @@ Free [baseUnitFilter] found in the ruins = 在遺跡中發現了免費的[baseUn
 [amount] population in a random city = 於一個隨機的城市增加了[amount]人口
 [amount] free random researchable Tech(s) from the [era] = 免費獲得在[era]的[amount]個可研究科技
 Gain a free [beliefType] belief = 獲得免費的[beliefType]信仰
+Gain [amount] [stat] = 獲得 [amount] [stat]
 Gain [amount]-[amount2] [stat] = 獲得 [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = 為萬神殿獲得足夠的信仰
 Gain enough Faith for [amount]% of a Great Prophet = 為一個大先知獲得足夠的信仰值的[amount]%
@@ -6156,6 +6166,8 @@ This Unit gains the [promotion] promotion = 該單位獲得[promotion]晉升
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index 8bcedef6b4..4524211424 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -399,6 +399,18 @@ Three Continents =
 Four Corners = Dört Kısım
 Archipelago = Takımadalar
 Inner Sea = İç Deniz
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Şehir devletlerinin sayısı
 One City Challenge = Tek Şehir Meydan Okuması
  # Requires translation!
@@ -5597,10 +5609,6 @@ Wu =
 Zhou = 
  # Requires translation!
 Sun = 
- # Requires translation!
-upon entering the [era] = 
- # Requires translation!
-Gain [amount] [stat] = 
 
  # Requires translation!
 Refaat = 
@@ -7563,6 +7571,8 @@ Free [baseUnitFilter] found in the ruins =
  # Requires translation!
 Gain a free [beliefType] belief = 
  # Requires translation!
+Gain [amount] [stat] = 
+ # Requires translation!
 Gain [amount]-[amount2] [stat] = 
  # Requires translation!
 Gain enough Faith for a Pantheon = 
@@ -7581,6 +7591,8 @@ This Unit gains the [promotion] promotion =
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index e84afe9bbd..adeba468e9 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -360,6 +360,18 @@ Three Continents = Три континенти
 Four Corners = Чотири кути
 Archipelago = Архіпелаг
 Inner Sea = Внутрішнє море
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Міст-держав
 One City Challenge = Випробовування «Одне місто»
 No City Razing = Заборонити руйнування міст
@@ -4937,9 +4949,6 @@ Zhao = Жао
 Wu = Ву
 Zhou = Жоу
 Sun = Сан
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = Отримати [amount] [stat]
 
 Refaat = Рефаат
 Heba = Геба
@@ -6139,6 +6148,7 @@ Free [baseUnitFilter] found in the ruins = Безкоштовний підроз
 [amount] population in a random city = [amount] населення у випадковому місті
 [amount] free random researchable Tech(s) from the [era] = [amount] безкоштовних технологій з [era]
 Gain a free [beliefType] belief = Отримати безкоштовне вірування: [beliefType]
+Gain [amount] [stat] = Отримати [amount] [stat]
 Gain [amount]-[amount2] [stat] = Отримати [amount]-[amount2] [stat]
 Gain enough Faith for a Pantheon = Отримати достатньо віри для пантеону
 Gain enough Faith for [amount]% of a Great Prophet = Отримати достатньо віри для [amount]% Великого Пророка
@@ -6150,6 +6160,8 @@ This Unit gains the [promotion] promotion = Цей підрозділ отрим
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties
index 37188664fd..89cb5e30e6 100644
--- a/android/assets/jsons/translations/Vietnamese.properties
+++ b/android/assets/jsons/translations/Vietnamese.properties
@@ -367,6 +367,18 @@ Three Continents =
 Four Corners = Bốn góc
 Archipelago = Quần đảo
 Inner Sea = Nội Hải
+ # Requires translation!
+Random number of Civilizations = 
+ # Requires translation!
+Min number of Civilizations = 
+ # Requires translation!
+Max number of Civilizations = 
+ # Requires translation!
+Random number of City-States = 
+ # Requires translation!
+Min number of City-States = 
+ # Requires translation!
+Max number of City-States = 
 Number of City-States = Số lượng Thành bang
 One City Challenge = Thử thách một thành phố
  # Requires translation!
@@ -4985,9 +4997,6 @@ Zhao = Zhao
 Wu = Wu
 Zhou = Zhou
 Sun = Mặt trời
- # Requires translation!
-upon entering the [era] = 
-Gain [amount] [stat] = Đạt được [amount] [stat]
 
 Refaat = Đặt lại
 Heba = Heba
@@ -6193,6 +6202,7 @@ Free [baseUnitFilter] found in the ruins = [baseUnitFilter] miễn phí được
 [amount] population in a random city = [amount] dân số trong một thành phố ngẫu nhiên
 [amount] free random researchable Tech(s) from the [era] = [amount] (các) Công nghệ có thể tìm kiếm lại ngẫu nhiên miễn phí từ [era]
 Gain a free [beliefType] belief = Có được Tín nguỡng [beliefType] miễn phí
+Gain [amount] [stat] = Đạt được [amount] [stat]
 Gain [amount]-[amount2] [stat] = Thu được [amount] - [amount2] [stat]
 Gain enough Faith for a Pantheon = Có đủ niềm tin cho một Đền thờ
 Gain enough Faith for [amount]% of a Great Prophet = Đạt được đủ Niềm tin cho [amount]% của một Nhà Tiên tri Vĩ đại
@@ -6204,6 +6214,8 @@ This Unit gains the [promotion] promotion = Đơn vị này nhận được khuy
  # Requires translation!
 upon discovering [tech] = 
  # Requires translation!
+upon entering the [era] = 
+ # Requires translation!
 upon adopting [policy] = 
  # Requires translation!
 upon declaring war with a major Civilization = 
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index afd80d8ee5..5e53dbf45b 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -10,7 +10,7 @@ Filipino = 96
 French = 99
 Portuguese = 51
 Indonesian = 99
-Catalan = 100
+Catalan = 99
 Finnish = 38
 Spanish = 99
 Malay = 24
@@ -27,6 +27,6 @@ Japanese = 72
 English = 0
 Vietnamese = 98
 Czech = 82
-Hungarian = 49
+Hungarian = 51
 Dutch = 63
 Greek = 15
diff --git a/changelog.md b/changelog.md
index 4e4500a04c..df84c4118c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,52 +1,20 @@
 ## 4.4.3
 
-Resolved  - can pick a policy with enough culture even if you have no cities
+Version 800!
+
+Can pick a policy with enough culture even if you have no cities
 
 Korea's unique applies to Library
 
 Notifications scroll retains position
 
-More cityinfo cleanup
-
-Move more context-specific functions out of CityInfo
-
-chore: Split CityInfo functions into CityTurnMAnager and CityFounder
-
-Fixed Android build, hopefully
-
-chore: More cleanup
-
-chore: Moved diplomacy functions to DiplomacyFunctions
-
-chore: Moved unit functions to UnitManager
-
-chore: More civinfo cleanup
-
-chore: More civinfo cleanup
-
-chore: More civinfo cleanup
-
-chore: Removed turn management functions from CivInfo
-
-chore: File reorg
-
-chore: File reorg
-
-chore: removed city state functions from civinfo
-
-chore: moved statsForNextTurn and happiness transients into civ stats
-
-Better indication of cached-updating functions for civinfo
-
 Displayed Great Person point requirements always take game speed into account
 
 Conditioned trigger uniques do not 'go off' without the trigger (e.g. when tech researched, building built)
 
-Resolve  - global alerts not translated properly
+Global alerts translated properly
 
-Add options to use random number of players and city states.  - By FiretronP75
-
-Remove China's faith boost when reaching classical era  - By RealBamboolord
+Add options to use random number of players and city states - By FiretronP75
 
 Refactor Cannot Move Unique  - By itanasi
 
diff --git a/fastlane/metadata/android/en-US/changelogs/800.txt b/fastlane/metadata/android/en-US/changelogs/800.txt
index 5974948168..e6b7c2fb72 100644
--- a/fastlane/metadata/android/en-US/changelogs/800.txt
+++ b/fastlane/metadata/android/en-US/changelogs/800.txt
@@ -1,51 +1,15 @@
-
-
-Resolved  - can pick a policy with enough culture even if you have no cities
+Can pick a policy with enough culture even if you have no cities
 
 Korea's unique applies to Library
 
 Notifications scroll retains position
 
-More cityinfo cleanup
-
-Move more context-specific functions out of CityInfo
-
-chore: Split CityInfo functions into CityTurnMAnager and CityFounder
-
-Fixed Android build, hopefully
-
-chore: More cleanup
-
-chore: Moved diplomacy functions to DiplomacyFunctions
-
-chore: Moved unit functions to UnitManager
-
-chore: More civinfo cleanup
-
-chore: More civinfo cleanup
-
-chore: More civinfo cleanup
-
-chore: Removed turn management functions from CivInfo
-
-chore: File reorg
-
-chore: File reorg
-
-chore: removed city state functions from civinfo
-
-chore: moved statsForNextTurn and happiness transients into civ stats
-
-Better indication of cached-updating functions for civinfo
-
 Displayed Great Person point requirements always take game speed into account
 
 Conditioned trigger uniques do not 'go off' without the trigger (e.g. when tech researched, building built)
 
-Resolve  - global alerts not translated properly
+Global alerts now translated properly
 
-Add options to use random number of players and city states.  - By FiretronP75
-
-Remove China's faith boost when reaching classical era  - By RealBamboolord
+Add options to use random number of players and city states - By FiretronP75
 
 Refactor Cannot Move Unique  - By itanasi
\ No newline at end of file