diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index b7a2e2ea69..5f9a0ab9d4 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -424,6 +424,8 @@ Translation files are generated successfully. = Arquivos de tradução foram ger
 # Notifications
 
 Research of [technologyName] has completed! = A pesquisa de [technologyName] foi terminada!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Você entrou em uma idade de ouro!
 [resourceName] revealed near [cityName] = [resourceName] revelado perto de [cityName]
 A [greatPerson] has been born in [cityName]! = [cityName] - Um [greatPerson] nasceu!
@@ -698,6 +700,14 @@ Name = Nome
 Closest city = Cidade mais próxima
 Action = Ação
 Defeated = Derrotado
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Painéis
 Natural Wonders = Maravilhas da Natureza
 Treasury deficit = Déficit do Tesouro
@@ -3730,6 +3740,7 @@ Fort = Forte
 
 Road = Estrada
 
+
 Remove Forest = Cortar floresta
 
 Remove Jungle = Cortar selva
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index c8f3c47a61..4e4e01988e 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -433,6 +433,8 @@ Translation files are generated successfully. = Soubory pro překlad úspešně
 # Notifications
 
 Research of [technologyName] has completed! = Výzkum technologie [technologyName] byl dokončen!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Započal Zlatý věk civilizace!
 [resourceName] revealed near [cityName] = [resourceName] objeven(a) poblíž [cityName]
 A [greatPerson] has been born in [cityName]! = [cityName] - Narodil se [greatPerson]!
@@ -714,6 +716,14 @@ Name = Jméno
 Closest city = Nejbližší město
 Action = Činnost
 Defeated = Poražený(á)
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Políčka
 Natural Wonders = Přírodní divy
 Treasury deficit = Nedostatek peněz
@@ -4019,6 +4029,7 @@ Fort = Opevnění
 
 Road = Cesta
 
+
 Remove Forest = Vykácet les
 
 Remove Jungle = Vykácet džungli
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index 0192ff5ecf..b31c7dfa26 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -689,6 +689,8 @@ Translation files are generated successfully. =
 # Notifications
 
 Research of [technologyName] has completed! = [technologyName] is onderzocht!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Een gouden eeuw is geariveerd!
 [resourceName] revealed near [cityName] = [resourceName] Ontdekt: in de buurt van [cityName]
 A [greatPerson] has been born in [cityName]! = [cityName] - Een [greatPerson] is geboren!
@@ -1089,6 +1091,14 @@ Action =
  # Requires translation!
 Defeated = 
  # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
+ # Requires translation!
 Tiles = 
  # Requires translation!
 Natural Wonders = 
@@ -5102,6 +5112,7 @@ Fort =
 
 Road = Weg
 
+
  # Requires translation!
 Remove Forest = 
 
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index f748fc69a8..0816c7a511 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -767,6 +767,8 @@ Translation files are generated successfully. =
  # Requires translation!
 Research of [technologyName] has completed! = 
  # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
+ # Requires translation!
 You have entered a golden age! = 
  # Requires translation!
 [resourceName] revealed near [cityName] = 
@@ -1293,6 +1295,14 @@ Action =
  # Requires translation!
 Defeated = 
  # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
+ # Requires translation!
 Tiles = 
  # Requires translation!
 Natural Wonders = 
@@ -5447,6 +5457,7 @@ Fort =
  # Requires translation!
 Road = 
 
+
  # Requires translation!
 Remove Forest = 
 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index e2beede5db..340f26c613 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -428,6 +428,8 @@ Translation files are generated successfully. = Les fichiers de traduction ont b
 # Notifications
 
 Research of [technologyName] has completed! = Recherche de [technologyName] terminé !
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Vous êtes entré dans un Âge d'Or !
 [resourceName] revealed near [cityName] = [resourceName] découvert près de [cityName]
 A [greatPerson] has been born in [cityName]! = [cityName] - Un [greatPerson] est né !
@@ -704,6 +706,14 @@ Name = Nom
 Closest city = Ville la plus proche
 Action = Action
 Defeated = Vaincu
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Cases
 Natural Wonders = Merveilles naturelles
 Treasury deficit = Déficit budgétaire
@@ -2983,6 +2993,7 @@ Fort = Fort
 
 Road = Route
 
+
 Remove Forest = Défricher la forêt
 
 Remove Jungle = Défricher la jungle
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index f6df4c2f95..0ed81db252 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -422,6 +422,8 @@ Translation files are generated successfully. = Die Übersetzungsdateien wurden
 # Notifications
 
 Research of [technologyName] has completed! = [technologyName] wurde erforscht!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Ein Goldenes Zeitalter hat begonnen!
 [resourceName] revealed near [cityName] = [resourceName] gefunden in der Nähe von [cityName]
 A [greatPerson] has been born in [cityName]! = [cityName] - Ein [greatPerson] wurde geboren!
@@ -692,6 +694,14 @@ Name = Name
 Closest city = Nächstgelegene Stadt
 Action = Aktion
 Defeated = Besiegt
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Felder
 Natural Wonders = Naturwunder
 Treasury deficit = Schatzkammerdefizit
@@ -2927,6 +2937,7 @@ Fort = Festung
 
 Road = Straße
 
+
 Remove Forest = Wald abholzen
 
 Remove Jungle = Dschungel abholzen
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 851c5927f1..4cda725dd3 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -422,6 +422,8 @@ Translation files are generated successfully. = File terjemahan berhasil dibuat.
 # Notifications
 
 Research of [technologyName] has completed! = Riset untuk [technologyName] sudah selesai
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Kamu telah memasuki masa kejayaan!
 [resourceName] revealed near [cityName] = [resourceName] terlihat di dekat [cityName]
 A [greatPerson] has been born in [cityName]! = Seorang [greatPerson] sudah lahir di [cityName]!
@@ -692,6 +694,14 @@ Name = Nama
 Closest city = Kota terdekat
 Action = Aksi
 Defeated = Dikalahkan
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Daerah
 Natural Wonders = Keajaiban Alam
 Treasury deficit = Defisit keuangan
@@ -2926,6 +2936,7 @@ Fort = Kubu Pertahanan
 
 Road = Jalan
 
+
 Remove Forest = Singkirkan Hutan
 
 Remove Jungle = Singkirkan Hutan Belantara
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index 6915fcb193..54c68f595c 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -422,6 +422,8 @@ Translation files are generated successfully. = File di traduzione creati con su
 # Notifications
 
 Research of [technologyName] has completed! = Abbiamo scoperto la tecnologia [technologyName]!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = È iniziata un'Età dell'Oro!
 [resourceName] revealed near [cityName] = Fonte di [resourceName] scoperta vicino a [cityName]
 A [greatPerson] has been born in [cityName]! = È nato un [greatPerson] nella città di [cityName]!
@@ -692,6 +694,14 @@ Name = Nome
 Closest city = Città più vicina
 Action = Azione
 Defeated = Sconfitto
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Caselle
 Natural Wonders = Meraviglie Naturali
 Treasury deficit = Deficit tesoreria
@@ -2926,6 +2936,7 @@ Fort = Forte
 
 Road = Strada
 
+
 Remove Forest = Rimuovi foresta
 
 Remove Jungle = Rimuovi giungla
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index 756bf57d18..88e228e65e 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -423,6 +423,8 @@ Translation files are generated successfully. = 翻訳ファイルが正常に
 # Notifications
 
 Research of [technologyName] has completed! = [technologyName]の研究が完了しました。
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = あなたは黄金時代に入りました！
 [resourceName] revealed near [cityName] = [cityName]の近くに[resourceName]が表れました。
 A [greatPerson] has been born in [cityName]! = [cityName]に[greatPerson]が誕生しました！
@@ -694,6 +696,14 @@ Name = 名前
 Closest city = 近いの都市
 Action = 行動
 Defeated = 敗北
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = タイル
 Natural Wonders = 自然遺産
 Treasury deficit = 収入の赤字
@@ -2944,6 +2954,7 @@ Fort = 要塞
 
 Road = 道路
 
+
 Remove Forest = 森林削除
 
 Remove Jungle = ジャングル削除
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index c3162ed5f9..0b38b5a1cc 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -422,6 +422,8 @@ Translation files are generated successfully. = 번역 파일이 성공적으로
 # Notifications
 
 Research of [technologyName] has completed! = [technologyName]의 연구가 끝났습니다!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = 황금기가 시작되었습니다!
 [resourceName] revealed near [cityName] = [cityName] 주변에서 [resourceName] 자원을 발견했습니다
 A [greatPerson] has been born in [cityName]! = [cityName]에서 [greatPerson]이(가) 탄생했습니다!
@@ -692,6 +694,14 @@ Name = 명칭
 Closest city = 가까운 도시
 Action = 상태
 Defeated = 패배
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = 타일
 Natural Wonders = 자연 경관
 Treasury deficit = 재무 적자
@@ -2942,6 +2952,7 @@ Fort = 요새
 
 Road = 도로
 
+
 Remove Forest = 숲 제거
 
 Remove Jungle = 정글 제거
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index 1630223aca..cc5b1fb653 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -432,6 +432,8 @@ Translation files are generated successfully. = Vertimo failai kuriami sėkminga
 # Notifications
 
 Research of [technologyName] has completed! = [technologyName] tyrimas baigtas!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Jūs įžengėte į aukso amžių! 
 [resourceName] revealed near [cityName] = [resourceName] parodytas šalia [cityName]
 A [greatPerson] has been born in [cityName]! = [GreatPerson] gimė mieste [cityName]!
@@ -708,6 +710,14 @@ Name = vardas
 Closest city = Artimiausias miestas
 Action = Veiksmas
 Defeated = Nugalėjo
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Plytelės
 Natural Wonders = Gamtos stebūklai
 Treasury deficit = Iždo deficitas
@@ -4717,6 +4727,7 @@ Fort =
  # Requires translation!
 Road = 
 
+
  # Requires translation!
 Remove Forest = 
 
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index fbf52d406a..661d942b95 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -719,6 +719,8 @@ Translation files are generated successfully. =
  # Requires translation!
 Research of [technologyName] has completed! = 
  # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
+ # Requires translation!
 You have entered a golden age! = 
  # Requires translation!
 [resourceName] revealed near [cityName] = 
@@ -1247,6 +1249,14 @@ Action =
  # Requires translation!
 Defeated = 
  # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
+ # Requires translation!
 Tiles = 
  # Requires translation!
 Natural Wonders = 
@@ -5268,6 +5278,7 @@ Fort =
  # Requires translation!
 Road = 
 
+
  # Requires translation!
 Remove Forest = 
 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index e46e9debc7..d53b082dd9 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -422,6 +422,8 @@ Translation files are generated successfully. = Fāyl hāye tarjome bā movaffa
 # Notifications
 
 Research of [technologyName] has completed! = Tahğig darbāre ye [technologyName] be natije resid!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Šomā vāred e yek asr e talāi šodid!
 [resourceName] revealed near [cityName] = [resourceName] kenār e [cityName] peydā šode ast
 A [greatPerson] has been born in [cityName]! = Yek [greatPerson] dar [cityName] be donyā āmade ast!
@@ -692,6 +694,14 @@ Name = Nām
 Closest city = Nazdik tarin šahr
 Action = Eğdām
 Defeated = Šekast ḵordid
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Zamin hā
 Natural Wonders = Ajāyeb e Tabi’i
 Treasury deficit = Kasri ye ḵazāne
@@ -4643,6 +4653,7 @@ Fort =
  # Requires translation!
 Road = 
 
+
  # Requires translation!
 Remove Forest = 
 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index aea2520ebb..5b34acdf4a 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -422,6 +422,8 @@ Translation files are generated successfully. = Faayl haaye tarjome baa movaffag
 # Notifications
 
 Research of [technologyName] has completed! = Tahghig darbaare ye [technologyName] be natije resid!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Shomaa vaared e yek asr e talaai shodid!
 [resourceName] revealed near [cityName] = [resourceName] kenaar e [cityName] peydaa shode ast
 A [greatPerson] has been born in [cityName]! = Yek [greatPerson] dar [cityName] be donyaa aamade ast!
@@ -692,6 +694,14 @@ Name = Naam
 Closest city = Nazdik tarin shahr
 Action = Eghdaam
 Defeated = Shekast khordid
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Zamin haa
 Natural Wonders = Ajaayeb e Tabi’i
 Treasury deficit = Kasri ye khazaane
@@ -4643,6 +4653,7 @@ Fort =
  # Requires translation!
 Road = 
 
+
  # Requires translation!
 Remove Forest = 
 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index 97a961d616..3e0eb50d02 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -427,6 +427,8 @@ Translation files are generated successfully. = Plik tłumaczeń wygenerowany po
 # Notifications
 
 Research of [technologyName] has completed! = Badania nad technologią [technologyName] zostały ukończone!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Twoje imperium weszło w Złotą Erę!
 [resourceName] revealed near [cityName] = [resourceName] odkryte nieopodal [cityName]
 A [greatPerson] has been born in [cityName]! = [cityName] - [greatPerson] urodził/a się!
@@ -702,6 +704,14 @@ Name = Nazwa
 Closest city = Najbliższe miasto
 Action = Akcja
 Defeated = Pokonany
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Pola
 Natural Wonders = Cuda Naturalne
 Treasury deficit = Deficyt budżetowy
@@ -3029,6 +3039,7 @@ Fort = Fort
 
 Road = Droga
 
+
 Remove Forest = Usuń las
 
 Remove Jungle = Usuń dżunglę
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index 14a47af747..88f12a4cc6 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -428,6 +428,8 @@ Translation files are generated successfully. = Arquivos de tradução foram ger
 # Notifications
 
 Research of [technologyName] has completed! = A pesquisa de [technologyName] foi terminada!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Você entrou em uma idade dourada!
 [resourceName] revealed near [cityName] = [resourceName] revelado perto de [cityName]
 A [greatPerson] has been born in [cityName]! = [cityName] - Um [greatPerson] nasceu!
@@ -714,6 +716,14 @@ Closest city = Cidade mais próxima
 Action = 
 Defeated = Derrotado
  # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
+ # Requires translation!
 Tiles = 
 Natural Wonders = Maravilhas da Natureza
  # Requires translation!
@@ -4246,6 +4256,7 @@ Fort =
 
 Road = Estrada
 
+
 Remove Forest = Cortar floresta
 
 Remove Jungle = Cortar selva
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index 79172af762..276ac4a4e8 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -428,6 +428,8 @@ Translation files are generated successfully. = Fișierele de traducere sunt gen
 # Notifications
 
 Research of [technologyName] has completed! = Cercetarea pentru [technologyName] s-a încheiat!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Ai intrat într-o epocă de aur!
 [resourceName] revealed near [cityName] = [resourceName] a fost dezvăluit lângă [cityName]
 A [greatPerson] has been born in [cityName]! = [cityName] - S-a născut un [greatPerson]!
@@ -704,6 +706,14 @@ Name = Nume
 Closest city = Cel mai apropiat oraș
 Action = Acțiune
 Defeated = Învins
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Titluri
 Natural Wonders = Minuni naturale
 Treasury deficit = Deficitul din trezorerie
@@ -4329,6 +4339,7 @@ Fort =
 
 Road = Drum
 
+
 Remove Forest = Defrișează pădurea
 
 Remove Jungle = Defrișează jungla
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index c90919e91a..de91f7498d 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -423,6 +423,8 @@ Translation files are generated successfully. = Файлы перевода со
 # Notifications
 
 Research of [technologyName] has completed! = Исследование завершено: [technologyName]
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Вы вошли в золотой век!
 [resourceName] revealed near [cityName] = Ресурс [resourceName] обнаружен вблизи г. [cityName]
 A [greatPerson] has been born in [cityName]! = В г. [cityName] появляется [greatPerson]!
@@ -694,6 +696,14 @@ Name = Имя
 Closest city = Ближайший город
 Action = Действие
 Defeated = Побежден
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Клетки
 Natural Wonders = Чудеса природы
 Treasury deficit = Дефицит сокровищ
@@ -2944,6 +2954,7 @@ Fort = Форт
 
 Road = Дорога
 
+
 Remove Forest = Вырубить лес
 
 Remove Jungle = Вырубить джунгли
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 90c5b4abe9..69dcca5ba8 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -423,6 +423,8 @@ Translation files are generated successfully. = 翻译文件生成成功
 # Notifications
 
 Research of [technologyName] has completed! = [technologyName]的研究已完成！
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = 你开启了一个黄金时代！
 [resourceName] revealed near [cityName] = 我们在[cityName]附近发现了[resourceName] 
 A [greatPerson] has been born in [cityName]! = [greatPerson]在[cityName]诞生了！
@@ -696,6 +698,14 @@ Name = 名称
 Closest city = 最近的城市
 Action = 行动
 Defeated = 战败
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = 地块
 Natural Wonders = 自然奇观
 Treasury deficit = 财政赤字
@@ -1173,7 +1183,7 @@ Kremlin = 克里姆林宫
 
 '...the location is one of the most beautiful to be found, holy and unapproachable, a worthy temple for the divine friend who has brought salvation and true blessing to the world.'  - King Ludwig II of Bavaria = “……选址是所能找到的当中风景最美丽的，圣洁而不可亵渎，一座配得起神圣朋友的圣所，他们给这个世界带来超度和真正的赐福。”——巴伐利亚国王路德维希二世
  # Requires translation!
-[stats] from every [building] = 
+[stats] from every [building] = 每座[building][stats]
 Neuschwanstein = 新天鹅堡
 
 25% of food is carried over after a new citizen is born = 城市增加新市民后保留25%食物储备以加速成长
@@ -1276,7 +1286,7 @@ Uqair = 乌盖尔
 Gubba = 古巴
 Hafriyat = 哈弗里亚特
 Nagar = 纳加尔
-Shubat Enlil = 舒巴特 恩利尔
+Shubat Enlil = 舒巴特-恩利尔
 Urhai = 乌海
 Urkesh = 乌尔克什
 Awan = 阿旺
@@ -1437,8 +1447,7 @@ Benihasan = 贝尼哈桑
 Badari = 巴达利
 Hermopolis = 荷莫波里斯
 Amrah = 阿姆拉
- # Requires translation!
-Koptos = 
+Koptos = 科普托斯
 Ombos = 奥博斯
 Naqada = 奈加代
 Semna = 塞姆纳
@@ -1988,8 +1997,7 @@ Buffalo Creek = 布法罗溪
 Brantford = 弗兰特福德
 Montreal = 蒙特利尔
 Genesse River = 日内瓦河
- # Requires translation!
-Canandaigua Lake = 
+Canandaigua Lake = 卡南代瓜湖
 Lake Simcoe =  西姆斯湖
 Salamanca = 萨拉曼卡
 Gowanda = 戈万达
@@ -2757,9 +2765,8 @@ Temples give +10% gold = 神庙的金钱产出+10%
  # Requires translation!
 +[amount]% [stat] from every [building] = 
 Reformation = 宗教改革
-+33% culture in all cities with a world wonder, immediately enter a golden age = 所有拥有奇观的城市文化产出+33%，立即进入黄金时代
- # Requires translation!
-+33% culture in all cities with a world wonder = 
++33% culture in all cities with a world wonder, immediately enter a golden age = 所有拥有世界奇观的城市文化产出+33%，立即进入黄金时代
++33% culture in all cities with a world wonder = 所有拥有世界奇观的城市文化产出+33%
 Free Religion = 信仰自由
 +1 culture for each monument, temple and monastery. Gain a free policy. = 每座纪念碑、神庙和修道院+1文化，免费推行1项社会政策
 Piety Complete = 完整的虔信政策
@@ -3115,6 +3122,7 @@ Fort = 堡垒
 
 Road = 道路
 
+
 Remove Forest = 砍伐森林
 
 Remove Jungle = 砍伐丛林
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index 3f93c00c9c..2a9cbb2ca7 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -424,6 +424,8 @@ Translation files are generated successfully. = Los archivos de traducción se g
 # Notifications
 
 Research of [technologyName] has completed! = ¡Investigación de [technologyName] completada!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = ¡Has entrado en una edad dorada!
 [resourceName] revealed near [cityName] = [resourceName] descubierto cerca de [cityName]
 A [greatPerson] has been born in [cityName]! = Un [greatPerson] ha nacido en [cityName]!
@@ -698,6 +700,14 @@ Name = Nombre
 Closest city = Ciudad más cercana
 Action =  Acción
 Defeated = Derrotado
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Casillas
 Natural Wonders = Maravillas naturales
 Treasury deficit = Déficit de tesorería
@@ -2951,6 +2961,7 @@ Fort = Fuerte
 
 Road = Carretera
 
+
 Remove Forest = Quitar bosque
 
 Remove Jungle = Quitar selva
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index ddd868ae5d..e83e83b43c 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -425,6 +425,8 @@ Translation files are generated successfully. = 翻譯檔案已成功生成。
 # Notifications
 
 Research of [technologyName] has completed! = [technologyName]的研究已完成!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = 你開啟了一個黃金時代!
 [resourceName] revealed near [cityName] = 我們在[cityName]附近發現了[resourceName] 
 A [greatPerson] has been born in [cityName]! = [greatPerson]在[cityName]誕生了!
@@ -698,6 +700,14 @@ Name = 名稱
 Closest city = 最近的城市
 Action = 行動
 Defeated = 戰敗
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = 地區
 Natural Wonders = 自然奇觀
 Treasury deficit = 財政赤字
@@ -3970,6 +3980,7 @@ Fort = 堡壘
 
 Road = 道路
 
+
 Remove Forest = 砍伐森林
 
 Remove Jungle = 砍伐叢林
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index 00428f4522..58e8ab1cc3 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -438,6 +438,8 @@ Translation files are generated successfully. = Çeviri dosyaları başarıyla o
 # Notifications
 
 Research of [technologyName] has completed! = [technologyName] araştırması tamamlandı!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Altın çağa girdiniz!
 [resourceName] revealed near [cityName] = [resourceName], [cityName] yakınlarında görüldü
 A [greatPerson] has been born in [cityName]! = [cityName] 'de bir [greatPerson] doğdu!
@@ -719,6 +721,14 @@ Name = İsim
 Closest city = En yakın şehir
 Action = Eylem
 Defeated = Mağlup
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Bölgeler
 Natural Wonders = Doğal Harikalar
 Treasury deficit = Hazine açığı
@@ -3575,6 +3585,7 @@ Fort = Kale
 
 Road = Yol
 
+
 Remove Forest = Ormanı ortadan kaldır
 
 Remove Jungle = Sık ormanı ortadan kaldır
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index 66030dde4b..b3d36eec7e 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -423,6 +423,8 @@ Translation files are generated successfully. = Файли для перекла
 # Notifications
 
 Research of [technologyName] has completed! = [technologyName]: досліджено!
+ # Requires translation!
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = Розпочалась Золота доба!
 [resourceName] revealed near [cityName] = [resourceName] виявлено біля [cityName]
 A [greatPerson] has been born in [cityName]! = [greatPerson] народився у місті [cityName]!
@@ -696,6 +698,14 @@ Name = Назва
 Closest city = Найближче місто
 Action = Дія
 Defeated = Переможено
+ # Requires translation!
+[numberOfCivs] Civilizations in the game = 
+ # Requires translation!
+Our Civilization: = 
+ # Requires translation!
+Known and alive ([numberOfCivs]) = 
+ # Requires translation!
+Known and defeated ([numberOfCivs]) = 
 Tiles = Клітини
 Natural Wonders = Природні дива
 Treasury deficit = Дефіцит коштів
@@ -2948,6 +2958,7 @@ Fort = Форт
 
 Road = Дорога
 
+
 Remove Forest = Вирубати ліс
 
 Remove Jungle = Вирубати джунглі
diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties
index ffd69ab3ae..329f26fcfc 100644
--- a/android/assets/jsons/translations/template.properties
+++ b/android/assets/jsons/translations/template.properties
@@ -422,6 +422,7 @@ Translation files are generated successfully. =
 # Notifications
 
 Research of [technologyName] has completed! = 
+[construction] has been obsolete and will be removed from construction queue in [cityName]! = 
 You have entered a golden age! = 
 [resourceName] revealed near [cityName] = 
 A [greatPerson] has been born in [cityName]! = 
@@ -693,6 +694,10 @@ Name =
 Closest city = 
 Action = 
 Defeated = 
+[numberOfCivs] Civilizations in the game = 
+Our Civilization: = 
+Known and alive ([numberOfCivs]) = 
+Known and defeated ([numberOfCivs]) = 
 Tiles = 
 Natural Wonders = 
 Treasury deficit = 
diff --git a/build.gradle.kts b/build.gradle.kts
index 6bab031d88..f7758556ac 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,7 @@ buildscript {
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}")
         classpath("de.richsource.gradle.plugins:gwt-gradle-plugin:0.6")
-        classpath("com.android.tools.build:gradle:4.0.0")
+        classpath("com.android.tools.build:gradle:4.0.1")
         classpath("com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1")
 
         // This is for wrapping the .jar file into a standalone executable
diff --git a/core/src/com/unciv/logic/civilization/TechManager.kt b/core/src/com/unciv/logic/civilization/TechManager.kt
index b4adce3e55..cd0addcdfa 100644
--- a/core/src/com/unciv/logic/civilization/TechManager.kt
+++ b/core/src/com/unciv/logic/civilization/TechManager.kt
@@ -264,7 +264,7 @@ class TechManager {
             for (constructionName in oldQueue) {
                 var newConstructionName = constructionName
                 if (constructionName in obsoleteUnits) {
-                    val text = "[$constructionName] has been obsolete and will remove from construction queue in [${city.name}]!"
+                    val text = "[$constructionName] has been obsolete and will be removed from construction queue in [${city.name}]!"
                     civInfo.addNotification(text, city.location, Color.BROWN)
                 }
                 else city.cityConstructions.constructionQueue.add(newConstructionName)
diff --git a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt
index 60fc001208..487d46a230 100644
--- a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt
+++ b/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt
@@ -24,7 +24,7 @@ import com.unciv.ui.utils.AutoScrollPane as ScrollPane
 
 class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPage: String = "Cities") : CameraStageBaseScreen(){
     private val topTable = Table().apply { defaults().pad(10f) }
-    private val centerTable = Table().apply {  defaults().pad(20f) }
+    private val centerTable = Table().apply { defaults().pad(5f) }
 
     init {
         onBackButtonClicked { game.setWorldScreen() }
@@ -84,7 +84,44 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
         val setDiplomacyButton = "Diplomacy".toTextButton()
         setDiplomacyButton.onClick {
             centerTable.clear()
-            centerTable.add(getDiplomacyGroup()).height(stage.height * 0.8f)
+            val relevantCivs = viewingPlayer.gameInfo.civilizations.filter { !it.isBarbarian() && !it.isCityState() }
+            val playerKnowsAndUndefeatedCivs = relevantCivs.filter { playerKnows(it) && !it.isDefeated() }
+            val playerKnowsAndDefeatedCivs = relevantCivs.filter { playerKnows(it) && it.isDefeated() }
+            if (playerKnowsAndUndefeatedCivs.size > 1)
+                centerTable.add(getDiplomacyGroup())
+            val civTable = Table()
+            civTable.background = ImageGetter.getBackground(Color.BLACK)
+            civTable.add("[${relevantCivs.size}] Civilizations in the game".toLabel()).pad(5f).colspan(4).row()
+            val titleTable = Table()
+            titleTable.add("Our Civilization:".toLabel()).pad(5f)
+            titleTable.add(ImageGetter.getNationIndicator(viewingPlayer.nation,25f)).pad(5f)
+            titleTable.add(viewingPlayer.civName.toLabel()).left().row()
+            civTable.add(titleTable).colspan(4).row()
+            civTable.addSeparator()
+            civTable.add("Known and alive ([${playerKnowsAndUndefeatedCivs.size - 1}])".toLabel()).pad(5f).colspan(4).row()
+            if (playerKnowsAndUndefeatedCivs.size > 1){
+                civTable.addSeparator()
+                playerKnowsAndUndefeatedCivs.filter { it != viewingPlayer }.forEach {
+                    civTable.add(ImageGetter.getNationIndicator(it.nation,25f)).pad(5f)
+                    if (playerKnowsAndUndefeatedCivs.indexOf(it) % 2 == 0)
+                        civTable.add(it.civName.toLabel()).left().row()
+                    else civTable.add(it.civName.toLabel()).left()
+                }
+            }
+            civTable.addSeparator()
+            civTable.add("Known and defeated ([${playerKnowsAndDefeatedCivs.size}])".toLabel()).pad(5f).colspan(4).row()
+            if (playerKnowsAndDefeatedCivs.isNotEmpty()){
+                civTable.addSeparator()
+                playerKnowsAndDefeatedCivs.forEach {
+                    civTable.add(ImageGetter.getNationIndicator(it.nation,25f)).pad(5f)
+                    if (playerKnowsAndDefeatedCivs.indexOf(it) % 2 != 0)
+                        civTable.add(it.civName.toLabel()).left().row()
+                    else civTable.add(it.civName.toLabel()).left()
+                }
+            }
+            val civTableScrollPane = ScrollPane(civTable)
+            civTableScrollPane.setOverscroll(false,false)
+            centerTable.add(civTableScrollPane.addBorder(2f, Color.WHITE)).pad(10f)
             centerTable.pack()
         }
         topTable.add(setDiplomacyButton)
@@ -107,7 +144,8 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
 
         val table = Table()
         table.add(topTable).row()
-        table.add(centerTable).expand().row()
+        table.addSeparator()
+        table.add(centerTable).height(stage.height - topTable.height).expand().row()
         table.setFillParent(true)
         stage.addActor(table)
     }
@@ -309,21 +347,21 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
             viewingPlayer.diplomacy.containsKey(civ.civName)
 
     private fun getDiplomacyGroup(): Group {
-        val relevantCivs = viewingPlayer.gameInfo.civilizations.filter { it.isMajorCiv() }
-        val freeWidth = stage.width
+        val relevantCivs = viewingPlayer.gameInfo.civilizations.filter { !it.isBarbarian() && !it.isCityState() }
+        val playerKnowsAndUndefeatedCivs = relevantCivs.filter { playerKnows(it) && !it.isDefeated() }
         val freeHeight = stage.height - topTable.height
         val group = Group()
-        group.setSize(freeWidth, freeHeight)
+        group.setSize(freeHeight,freeHeight)
         val civGroups = HashMap<String, Actor>()
         val civLines = HashMap<String, MutableSet<Actor>>()
-        for (i in 0..relevantCivs.lastIndex) {
-            val civ = relevantCivs[i]
+        for(i in 0..playerKnowsAndUndefeatedCivs.lastIndex){
+            val civ = playerKnowsAndUndefeatedCivs[i]
 
-            val civGroup = getCivGroup(civ, "", viewingPlayer)
+            val civGroup = ImageGetter.getNationIndicator(civ.nation,30f)
 
-            val vector = HexMath.getVectorForAngle(2 * Math.PI.toFloat() * i / relevantCivs.size)
+            val vector = HexMath.getVectorForAngle(2 * Math.PI.toFloat() *i / playerKnowsAndUndefeatedCivs.size)
             civGroup.center(group)
-            civGroup.moveBy(vector.x * freeWidth / 2.5f, vector.y * freeHeight / 2.5f)
+            civGroup.moveBy(vector.x*freeHeight/2.25f, vector.y*freeHeight/2.25f)
             civGroup.touchable = Touchable.enabled
             civGroup.onClick {
                 onCivClicked(civLines, civ.civName)
@@ -345,7 +383,7 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
                     civLines[civ.civName] = mutableSetOf()
 
                 val statusLine = ImageGetter.getLine(civGroup.x + civGroup.width / 2, civGroup.y + civGroup.height / 2,
-                        otherCivGroup.x + otherCivGroup.width / 2, otherCivGroup.y + otherCivGroup.height / 2, 3f)
+                        otherCivGroup.x + otherCivGroup.width / 2, otherCivGroup.y + otherCivGroup.height / 2, 2f)
 
                 val diplomacyLevel = diplomacy.diplomaticModifiers.values.sum()
                 statusLine.color = getColorForDiplomacyLevel(diplomacyLevel)
@@ -426,14 +464,14 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
             val holder = Group()
             resourceImage.onClick {
                 if (visibleLabel != null)
-                    visibleLabel!!.setVisible(false)
-                resourceLabel.setVisible(true)
+                    visibleLabel!!.isVisible = false
+                resourceLabel.isVisible = true
                 visibleLabel = resourceLabel
             }
             holder.addActor(resourceImage)
             holder.addActor(resourceLabel)
-            holder.setSize(resourceImage.getWidth(),
-                    resourceImage.getHeight() + resourceLabel.getHeight() + labelPadding)
+            holder.setSize(resourceImage.width,
+                    resourceImage.height + resourceLabel.height + labelPadding)
             // Center-align all labels, but right-align the last couple resources' labels
             // because they may get clipped otherwise. The leftmost label should be fine
             // center-aligned (if there are more than 2 resources), because the left side
@@ -442,9 +480,9 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
                 (resources.indexOf(resource) + 2 >= resources.count()) -> 1
                 else -> 2
             }
-            resourceLabel.moveBy((resourceImage.getWidth() - resourceLabel.getWidth()) / alignFactor,
-                    resourceImage.getHeight() + labelPadding)
-            resourceLabel.setVisible(false)
+            resourceLabel.moveBy((resourceImage.width - resourceLabel.width) / alignFactor,
+                    resourceImage.height + labelPadding)
+            resourceLabel.isVisible = false
             resourcesTable.add(holder)
         }
         resourcesTable.addSeparator()