diff --git a/android/assets/jsons/Civ V - Vanilla/Policies.json b/android/assets/jsons/Civ V - Vanilla/Policies.json
index 73b096f4d8..6c8146498f 100644
--- a/android/assets/jsons/Civ V - Vanilla/Policies.json	
+++ b/android/assets/jsons/Civ V - Vanilla/Policies.json	
@@ -94,7 +94,7 @@
 		"policies": [
 			{
 				"name": "Warrior Code",
-				"uniques":["+[20]% Production when constructing [Melee] units"],
+				"uniques":["+[20]% Production when constructing [Melee] units [in all cities]"],
 				"row": 1,
 				"column": 2
 			},
@@ -419,7 +419,7 @@
 			},
 			{
 				"name": "Total War",
-				"uniques": ["+[15]% Production when constructing [Military] units", "New [Military] units start with [15] Experience"],
+				"uniques": ["+[15]% Production when constructing [Military] units [in all cities]", "New [Military] units start with [15] Experience"],
 				"requires": ["Police State","Fascism"],
 				"row": 3,
 				"column": 4
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index bbb5993598..c46bd6c3a9 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -1001,7 +1001,8 @@ Floating Gardens = Jardins Flutuantes
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = 'Não é tanto por sua beleza que a floresta clama ao coração dos homens, mas por aquela coisa sutil, aquela qualidade do ar, aquela emanação de velhas árvores, que tão maravilhosamente muda e renova um espírito cansado.' - Robert Louis Stevenson 
 +[amount]% growth in all cities = +[amount]% de crescimento em todas cidades
-+[amount]% Production when constructing [unitType] units = +[amount]% a mais de produção construindo as unidades deste tipo [unitType]
+ # Requires translation!
++[amount]% Production when constructing [unitType] units [cityFilter] = 
 Temple of Artemis = Templo de Artemis
 
 Walls = Muralhas
@@ -1038,8 +1039,6 @@ Lighthouse = Farol
 All military naval units receive +1 movement and +1 sight = Todas as unidades navais recebem +1 movimento e +1 no alcance de visão
 The Great Lighthouse = O Grande Farol
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = Estábulos
 
 Cost increases by [amount] per owned city = Custo aumentado em [amount] por cidade governada 
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 1a7269de46..fae5879d25 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -944,11 +944,8 @@ in this city = v tomto městě
 in all cities = v každém městě
 in all coastal cities = v každém pobřežním městě
 in capital = v hlavním městě
- # Requires translation!
 in all cities with a world wonder = v každém městě s divem
- # Requires translation!
 in all cities connected to capital = v každém městě spojeném s hlavním
- # Requires translation!
 in all cities with a garrison = v každém městě s posádkou
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
@@ -983,7 +980,7 @@ Floating Gardens = Plovoucí zahrady
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = 'Není to ani tak nádhera lesa, co si nárokuje srdce mužů, jako spíše něco nenápadného, jako kvalita vzduchu či vyzařování starých stromů, co tak úžasně obnoví unaveného ducha.'  - Robert Louis Stevenson
 +[amount]% growth in all cities = +[amount]% přírůstek ve všech městech
-+[amount]% Production when constructing [unitType] units = +[amount]% produkce při stavbě [unitType] jednotky
++[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% produkce při stavbě [unitType] jednotky [cityFilter]
 Temple of Artemis = Artemidin chrám 
 
 Walls = Hradby
@@ -1018,7 +1015,6 @@ Lighthouse = Maják
 All military naval units receive +1 movement and +1 sight = Všechny vojenské námořní jednotky získají +1 pohyb a +1 dohled
 The Great Lighthouse = Maják na ostrově Faru
 
-+[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% produkce při stavbě [unitType] jednotky [cityFilter]
 Stable = Stáje
 
 Cost increases by [amount] per owned city = Cena se zvyšuje o [amount] za každé město
@@ -2492,7 +2488,6 @@ Ahahah! You seem to show some skills of a true Viking! Too bad that I'll probabl
 Loki must have stood by you, for a common man alone could not have defeated me... Oh well! I will join the einherjar in Valhalla and feast, while you toil away here. = Loki musel stát při vás, protože obyčejný člověk sám mě nemohl porazit ... No dobře! Připojím se k einherjům ve Valhalle a budu hodovat, zatímco ty se budeš lopotit dál.
 Harad Bluetooth bids you welcome to his lands, a Viking unlike any the seas and lands have ever known! Hah, are you afraid? = Harad Modrozub vás vítá ve své zemi, Viking, jakého dosud žádná moře a země nepoznaly! Ha, bojíte se?
 This is a fine deal! Even a drunk beggar would agree! = To je skvělý obchod! I opilý žebrák by souhlasil!
- # Requires translation!
 Hail to you. = Zdravím vás.
 Viking Fury = Vikingská zuřivost
 +1 Movement for all embarked units = +1 pohyb pro naloděné jednotky
@@ -2566,14 +2561,12 @@ They will write songs of this.... pray that they shall be in your favor. = Budou
 
 Dublin = Dublin
 War lingers in our hearts. Why carry on with a false peace? = Válka přetrvává v našich srdcích. Proč pokračovat ve falešném míru?
- # Requires translation!
 You gormless radger! You'll dine on your own teeth before you set foot in Ireland! = Ty bezbožný vztekloune! Dřív budeš obědvat vlastní zuby, než vstoupíš do Irska!
 A lonely wind blows through the highlands today. A dirge for Ireland. Can you hear it? = Na vysočinách dnes fouká osamocený vítr. Žalozpěv pro Irsko. Slyšíš ho?
 
 Tyre = Tyr
 We never fully trusted you from the start. = Už od začátku jsme vám nikdy plně nevěřili.
 
- # Requires translation!
 Ur = Ur
 I will enjoy hearing your last breath as you witness the destruction of your realm! = Budu si užívat poslech vašeho posledního dechu až budete svědky zničení vaší říše!
 Why do we fight? Because Inanna demands it. Now, witness the power of the Sumerians! = Proč bojujeme? Protože to Inanna požaduje. Teď buďte svědky moci Sumerů!
@@ -2598,19 +2591,14 @@ Almaty = Almaty
 How could we fall to the likes of you?! = Jak jsme mohli padnout před někým, jako jste vy?!
 
 Edinburgh = Edinburk
- # Requires translation!
 You shall stain this land no longer with your vileness! To arms, my countrymen - we ride to war! = Tuto zemi už neposkvrníš svou ohavností! Do zbraně, moji krajané - jedeme do války!
- # Requires translation!
 Traitorous man! The Celtic peoples will not stand for such wanton abuse and slander - I shall have your head! = Zrádče! Keltské národy nebudou tolerovat takové svévolné zneužívání a pomlouvání - budu mít tvou hlavu!
- # Requires translation!
 Vile ruler, know that you 'won' this war in name only! = Podlý vládče, vězte, že jste tuto válku „vyhráli“ pouze jménem!
 
 Singapore = Singapur
- # Requires translation!
 Perhaps, in another world, we could have been friends... = Možná bychom v jiném světě mohli být přátelé ...
 
 Zanzibar = Zanzibar
- # Requires translation!
 May the Heavens forgive you for inflicting this humiliation to our people. = Kéž vám nebesa odpustí, že jste našim lidem způsobili takové ponížení.
 
 Sydney = Sydney
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index 3bd55cb0e5..db54ac1de7 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -1033,7 +1033,7 @@ Floating Gardens =
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Temple of Artemis = 
 
@@ -1086,8 +1086,6 @@ All military naval units receive +1 movement and +1 sight =
  # Requires translation!
 The Great Lighthouse = 
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Stable = 
 
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index e437c6895e..d90121111b 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -1821,7 +1821,7 @@ Floating Gardens =
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Temple of Artemis = 
 
@@ -1879,8 +1879,6 @@ All military naval units receive +1 movement and +1 sight =
  # Requires translation!
 The Great Lighthouse = 
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Stable = 
 
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index 107befd9fb..6a779ec542 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -1085,7 +1085,7 @@ Floating Gardens =
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Temple of Artemis = 
 
@@ -1129,8 +1129,6 @@ Lighthouse = Majakka
 All military naval units receive +1 movement and +1 sight = Kaikki laivaston yksiköt saavat +1 Liikkuvuutta ja +1 Näkökykyä
 The Great Lighthouse = Faroksen majakka
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = Talli
 
  # Requires translation!
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 4929f5d542..c2a883283f 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -993,7 +993,8 @@ Floating Gardens = Jardins suspendu
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = 'Ce n’est pas tant pour sa beauté que la forêt revendique le cœur des hommes, que pour cette chose subtile, cette qualité d’air, cette émanation des vieux arbres, qui change si merveilleusement et renouvelle un esprit las.'  - Robert Louis Stevenson
 +[amount]% growth in all cities = +[amount]% de croissance dans toutes les villes
-+[amount]% Production when constructing [unitType] units = +[amount]% de production lors de la production d'unité [unitType]
+ # Requires translation!
++[amount]% Production when constructing [unitType] units [cityFilter] = 
 Temple of Artemis = Temple d'Aremis
 
 Walls = Murs
@@ -1030,8 +1031,6 @@ Lighthouse = Phare
 All military naval units receive +1 movement and +1 sight = +1 de mouvement et +1 de vision à toutes les unités navales militaires
 The Great Lighthouse = le Grand Phare
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = Écurie
 
 Cost increases by [amount] per owned city = Le cout augmente de [amount] par ville possédée
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 8377244065..a884418f14 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -980,7 +980,7 @@ Floating Gardens = Schwimmende Gärten
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = Nicht so sehr wegen seiner Schönheit erhebt der Wald Anspruch auf die Herzen der Menschen, sondern wegen des subtilen Etwas, der Luftqualität, der Ausstrahlung der alten Bäume, die sich so wunderbar verändert und einen müden Geist erneuert.  - Robert Louis Stevenson
 +[amount]% growth in all cities = +[amount]% Wachstum in allen Städten
-+[amount]% Production when constructing [unitType] units = +[amount]% Produktion beim Trainieren von "[unitType]"-Einheiten
++[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% Produktion beim Bau von [unitType] Einheiten [cityFilter]
 Temple of Artemis = Tempel der Artemis
 
 Walls = Mauern
@@ -1015,7 +1015,6 @@ Lighthouse = Leuchtturm
 All military naval units receive +1 movement and +1 sight = Alle militärischen Marineeinheiten erhalten +1 Bewegung und +1 Sicht
 The Great Lighthouse = Der Große Leuchtturm
 
-+[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% Produktion beim Bau von [unitType] Einheiten [cityFilter]
 Stable = Stall
 
 Cost increases by [amount] per owned city = Kosten erhöhen sich um [amount] per Stadt in Eurem Besitz
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 37bb0ec4a8..b4c48a0343 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -1015,7 +1015,7 @@ Floating Gardens = Úszó kertek
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = 
 +[amount]% growth in all cities = +[amount]% növekedés minden városban
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
 Temple of Artemis = Artemisz temploma
 
 Walls = Falak
@@ -1055,8 +1055,6 @@ Lighthouse = Világítótorony
 All military naval units receive +1 movement and +1 sight = Minden katonai tengeri egység kap +1 mozgáspontot és +1 látótávolságot
 The Great Lighthouse = Alexandriai világítótorony
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = Istálló
 
 Cost increases by [amount] per owned city = A költségek [amount] nőnek városonként
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index ea5ef0ded6..69fa6c6ff7 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -983,7 +983,7 @@ Floating Gardens = Taman Mengapung
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = 'Bukan dengan banyaknya keindahan sang hutan menggugat hati manusia, tetapi dengan adanya hal-hal kecil seperti segarnya udara dan aura pohon-pohon tua, mereka mengubah dan memperbarui jiwa yang letih lesu dengan begitu hebatnya.'  - Robert Louis Stevenson
 +[amount]% growth in all cities = +[amount]% pertumbuhan di semua kota
-+[amount]% Production when constructing [unitType] units = +[amount]% Produksi ketika membuat unit [unitType]
++[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% Produksi ketika membuat unit [unitType] [cityFilter]
 Temple of Artemis = Kuil Artemis
 
 Walls = Tembok
@@ -1018,7 +1018,6 @@ Lighthouse = Mercusuar
 All military naval units receive +1 movement and +1 sight = Semua unit militer laut mendapatkan +1 pergerakan dan +1 penglihatan
 The Great Lighthouse = Mercusuar Mulia
 
-+[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% Produksi ketika membuat unit [unitType] [cityFilter]
 Stable = Kandang Kuda
 
 Cost increases by [amount] per owned city = Biaya meningkat sebesar [amount] per kota yang dimiliki
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index efbaab36f4..e4bf1a4fe9 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -980,7 +980,7 @@ Floating Gardens = Giardini galleggianti
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = 'Non è tanto con la sua bellezza che la foresta tocca il cuore degli uomini, ma con un'indefinibile sottigliezza, una certa qualità dell'aria, con l'emanazione degli antichi alberi, che così meravigliosamente muta e rinnova uno spirito fiaccato.' - Robert Louis Stevenson
 +[amount]% growth in all cities = +[amount]% crescita in tutte le Città 
-+[amount]% Production when constructing [unitType] units = +[amount]% Produzione per le unità [unitType]
++[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% Produzione quando costruisci unità [unitType] [cityFilter]
 Temple of Artemis = Tempio di Artemide
 
 Walls = Mura
@@ -1015,7 +1015,6 @@ Lighthouse = Faro
 All military naval units receive +1 movement and +1 sight = +1 Movimento e +1 Visione per ogni unità militare marittima
 The Great Lighthouse = Grande Faro
 
-+[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% Produzione quando costruisci unità [unitType] [cityFilter]
 Stable = Scuderia
 
 Cost increases by [amount] per owned city = Il costo aumenta di [amount] per Città posseduta
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index 4fa531008a..02247fc944 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -1000,7 +1000,8 @@ Floating Gardens = 水上庭園
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = 「森が人間の心に訴えかけてくる理由はその美しさではなく、もっと漠然とした何かであり、その空気の質であり、古い木々の息づかいであり、不思議なほど人間の心を癒やしてくれるからである」 - ロバート・ルイス・スティーブンソン
 +[amount]% growth in all cities = 全都市の成長速度+[amount]%
-+[amount]% Production when constructing [unitType] units = [unitType]生産時に生産力+[amount]%
+ # Requires translation!
++[amount]% Production when constructing [unitType] units [cityFilter] = 
 Temple of Artemis = アルテミス神殿
 
 Walls = 防壁
@@ -1037,8 +1038,6 @@ Lighthouse = 灯台
 All military naval units receive +1 movement and +1 sight = 全海軍ユニットに移動+1、視界+1
 The Great Lighthouse = ファロス灯台
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = 厩舎
 
 Cost increases by [amount] per owned city = 所有する都市ごとにコストが[amount]増加
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 947fccb709..e91c37f5cf 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -1003,7 +1003,8 @@ Floating Gardens = 수상 정원
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = '인간이 숲을 동경하는 이유는 그저 숲이 아름다워서가 아니라 오래된 숲의 고목에서 뿜어져 나오는 공기에 존재하는 미묘한 무엇인가가 사람의 지친 영혼에 활기를 불어넣어 주고 회복시켜 주기 때문이다.' - 로버트 루이스 스티븐슨
 +[amount]% growth in all cities = 모든 도시에 식량 생산량 +[amount]%
-+[amount]% Production when constructing [unitType] units = [unitType] 유닛 생산 시 생산력 +[amount]%
+ # Requires translation!
++[amount]% Production when constructing [unitType] units [cityFilter] = 
 Temple of Artemis = 아르테미스 사원
 
 Walls = 성벽
@@ -1040,8 +1041,6 @@ Lighthouse = 등대
 All military naval units receive +1 movement and +1 sight = 모든 해상 군사 유닛의 행동력 +1, 시야 +1
 The Great Lighthouse = 알렉산드리아 등대
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = 마구간
 
 Cost increases by [amount] per owned city = 도시 하나당 비용 [amount] 증가
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index e749809ee5..12a177f962 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -1143,7 +1143,7 @@ Floating Gardens =
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Temple of Artemis = 
 
@@ -1201,8 +1201,6 @@ All military naval units receive +1 movement and +1 sight =
  # Requires translation!
 The Great Lighthouse = 
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Stable = 
 
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index e97050706e..904a7127cf 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -1654,7 +1654,7 @@ Floating Gardens = Taman Terapung
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
 Temple of Artemis = Temple of Artemis
 
 Walls = Dinding
@@ -1706,8 +1706,6 @@ All military naval units receive +1 movement and +1 sight =
  # Requires translation!
 The Great Lighthouse = 
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = Kandang
 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index b905cfb07f..828aba68c0 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -1090,7 +1090,7 @@ Floating Gardens =
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Temple of Artemis = 
 
@@ -1136,8 +1136,6 @@ All military naval units receive +1 movement and +1 sight =
  # Requires translation!
 The Great Lighthouse = 
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Stable = 
 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index 5d02c5b74e..95cf6263cc 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -1087,7 +1087,7 @@ Floating Gardens =
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Temple of Artemis = 
 
@@ -1133,8 +1133,6 @@ All military naval units receive +1 movement and +1 sight =
  # Requires translation!
 The Great Lighthouse = 
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Stable = 
 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index d923e75451..91906b62a2 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -1026,7 +1026,7 @@ Floating Gardens = Pływające Ogrody
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
 Temple of Artemis = Świątyna Artemisa
 
 Walls = Mury
@@ -1064,8 +1064,6 @@ Lighthouse = Latarnia Morska
 All military naval units receive +1 movement and +1 sight = Każda morska jednostka wojskowa otrzymuje +1 do ruchu i pola widzenia
 The Great Lighthouse = Latarnia z Faros
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = Stajnia
 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index 1769008bdc..3e3b0d790b 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -1075,7 +1075,7 @@ Floating Gardens =
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Temple of Artemis = 
 
@@ -1119,8 +1119,6 @@ Lighthouse = Farol
 All military naval units receive +1 movement and +1 sight = Todas as unidades navais recebem +1 movimento e +1 em sua linha de visão
 The Great Lighthouse = O Grande Farol
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = Estábulos
 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index 3ecdbee50e..a54d129c87 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -1179,7 +1179,7 @@ Floating Gardens =
  # Requires translation!
 +[amount]% growth in all cities = 
  # Requires translation!
-+[amount]% Production when constructing [unitType] units = 
++[amount]% Production when constructing [unitType] units [cityFilter] = 
  # Requires translation!
 Temple of Artemis = 
 
@@ -1223,8 +1223,6 @@ Lighthouse = Far
 All military naval units receive +1 movement and +1 sight = Toate unitățile militare navale primesc +1 deplasare și +1 raza vizuală
 The Great Lighthouse = Marele Far
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = Grajd
 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index 2161764188..74dd09ed59 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -1004,7 +1004,8 @@ Floating Gardens = Висячие сады
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = 'Лес пленяет сердца людей не столько своей красотой, сколько прекрасным воздухом, эманацией старых деревьев, чем-то неуловимым, что так замечательно изменяет и восстанавливает усталый дух' - Роберт Льюис Стивенсон
 +[amount]% growth in all cities = +[amount]% к приросту пищи во всех городах
-+[amount]% Production when constructing [unitType] units = +[amount]% к производству при создании [unitType]
+ # Requires translation!
++[amount]% Production when constructing [unitType] units [cityFilter] = 
 Temple of Artemis = Храм Артемиды
 
 Walls = Стены
@@ -1041,8 +1042,6 @@ Lighthouse = Маяк
 All military naval units receive +1 movement and +1 sight = Все военно-морские юниты получают +1 к передвижению и обзору
 The Great Lighthouse = Фаросский маяк
 
- # Requires translation!
-+[amount]% Production when constructing [unitType] units [cityFilter] = 
 Stable = Конюшня
 
 Cost increases by [amount] per owned city = Стоимоисть строительства увеличивается на [amount] за каждый город под вашим контролем
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index bd0ebe7f23..97f7c0eed1 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -983,7 +983,7 @@ Floating Gardens = 水上园圃
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = “森林在世人心中享有崇高的地位，并非仅仅因为它的美丽，还有一些微妙的东西，例如古老树木所散发出来的独特气息，能够如此奇妙地让疲惫的精神重新振奋起来。”——罗伯特·路易斯·斯蒂文森（英国作家）
 +[amount]% growth in all cities = 所有城市+[amount]%食物积累速率
-+[amount]% Production when constructing [unitType] units = 组建[unitType]单位时+[amount]%产能
++[amount]% Production when constructing [unitType] units [cityFilter] = [cityFilter]组建[unitType]单位时+[amount]%产能
 Temple of Artemis = 阿尔忒弥斯神庙
 
 Walls = 城墙
@@ -1018,7 +1018,6 @@ Lighthouse = 灯塔
 All military naval units receive +1 movement and +1 sight = 所有海军军事单位+1移动力和+1视野
 The Great Lighthouse = 大灯塔
 
-+[amount]% Production when constructing [unitType] units [cityFilter] = [cityFilter]组建[unitType]单位时+[amount]%产能
 Stable = 马厩
 
 Cost increases by [amount] per owned city = 每座己方城市使建造所需的产能花费增加[amount]
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index f37e1b03ed..91c101544f 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -983,7 +983,7 @@ Floating Gardens = Jardines flotantes
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = "No es tanto por su belleza que el bosque reclama el corazón de los hombres, sino por ese algo sutil, esa calidad del aire, esa emanación de árboles viejos, que tan maravillosamente cambia y renueva un espíritu cansado". - Robert Louis Stevenson
 +[amount]% growth in all cities = +[amount]% de crecimiento en todas las ciudades
-+[amount]% Production when constructing [unitType] units = +[amount]% de Producción cuando construyes unidades [unitType]
++[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% de Production al construir unidades [unitType] [cityFilter]
 Temple of Artemis = Templo de artemisa
 
 Walls = Muralla
@@ -1018,7 +1018,6 @@ Lighthouse = Faro
 All military naval units receive +1 movement and +1 sight = Todas las unidades militares navales reciben +1de movimiento y +1 de vision
 The Great Lighthouse = El Gran Faro
 
-+[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% de Production al construir unidades [unitType] [cityFilter]
 Stable = Establos
 
 Cost increases by [amount] per owned city = El costo aumenta en [amount] por ciudad de propiedad
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index ec218fd772..f90e4ae5a3 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -983,7 +983,7 @@ Floating Gardens = 水上園圃
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = “森林在世人心中享有崇高的地位，並非僅僅因為它的美麗，還有一些微妙的東西，例如古老樹木所散發出來的獨特氣息，能够如此奇妙地讓疲憊的精神重新振奮起來。”——羅伯特·路易斯·斯蒂文森（英國作家）
 +[amount]% growth in all cities = 所有城市+[amount]%食物積累速率
-+[amount]% Production when constructing [unitType] units = 訓練[unitType]單位時+[amount]%產能
++[amount]% Production when constructing [unitType] units [cityFilter] = [cityFilter]訓練[unitType]單位時+[amount]%產能
 Temple of Artemis = 阿爾忒彌斯神廟
 
 Walls = 城牆
@@ -1018,7 +1018,6 @@ Lighthouse = 燈塔
 All military naval units receive +1 movement and +1 sight = 所有海軍軍事單位+1移動力和+1視野
 The Great Lighthouse = 大燈塔
 
-+[amount]% Production when constructing [unitType] units [cityFilter] = [cityFilter]訓練[unitType]單位時+[amount]%產能
 Stable = 馬廄
 
 Cost increases by [amount] per owned city = 每座己方城市使建造所需的產能花費增加[amount]
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index c10b8b1861..47580f9ff3 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -983,7 +983,7 @@ Floating Gardens = Yüzen Bahçeler
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = "Ormanın, insanların kalpleri üzerinde hak iddia etmesi, o ince şey, o hava kalitesi, yaşlı ağaçlardan yayılan o kadar harika bir şekilde değişen ve yorgun bir ruhu yenileyen bir şey değil." - Robert Louis Stevenson
 +[amount]% growth in all cities = Bütün şehirlerde +%[amount] büyüme
-+[amount]% Production when constructing [unitType] units = [unitType] birimleri oluştururken + %[amount] Üretim
++[amount]% Production when constructing [unitType] units [cityFilter] = [unitType] birimleri [cityFilter] oluştururken + %[amount] Üretim
 Temple of Artemis = Artemis Tapınağı
 
 Walls = Surlar
@@ -1018,7 +1018,6 @@ Lighthouse = Deniz feneri
 All military naval units receive +1 movement and +1 sight = Tüm askeri deniz birliklerine +1 hareket ve +1 görüş verilir
 The Great Lighthouse = Büyük Deniz Feneri
 
-+[amount]% Production when constructing [unitType] units [cityFilter] = [unitType] birimleri [cityFilter] oluştururken + %[amount] Üretim
 Stable = Ahır
 
 Cost increases by [amount] per owned city = Maliyet, sahip olunan şehir başına [amount] miktar arttı
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index 98b3bcb9be..760cd29e16 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -986,7 +986,7 @@ Floating Gardens = Плавні острови
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = «Не стільки своєю красою ліс утримує людські серця, скільки чимось тонким, як-от повітря, що виходить зі старих дерев, що так дивовижно змінює та оновлює втомлений дух» — Роберт Луїс Стівенсон.
 +[amount]% growth in all cities = +[amount]% бонус до зростання в усіх містах
-+[amount]% Production when constructing [unitType] units = +[amount]% до виробництва, коли створюють [unitType] підрозділи 
++[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% виробництва, коли створюються підрозділи типу «[unitType]» у [cityFilter] 
 Temple of Artemis = Храм Артеміди
 
 Walls = Мури
@@ -1021,7 +1021,6 @@ Lighthouse = Маяк
 All military naval units receive +1 movement and +1 sight = Усі військові морські підрозділи отримують рух +1 і огляд +1
 The Great Lighthouse = Александрійський маяк
 
-+[amount]% Production when constructing [unitType] units [cityFilter] = +[amount]% виробництва, коли створюються підрозділи типу «[unitType]» у [cityFilter] 
 Stable = Стайня
 
 Cost increases by [amount] per owned city = Вартість збільшується на [amount] за кожне місто
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index 0d63e94ad5..d57ada35ae 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -1,7 +1,7 @@
 Persian_(Pinglish-UN) = 25
-Italian = 99
+Italian = 100
 Russian = 98
-German = 99
+German = 100
 Turkish = 78
 Ukrainian = 99
 French = 93
@@ -20,6 +20,6 @@ Simplified_Chinese = 99
 Persian_(Pinglish-DIN) = 25
 Japanese = 98
 English = 1
-Czech = 98
+Czech = 99
 Hungarian = 75
 Dutch = 31
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index f7b2adb8be..232734b6e1 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.4.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 546
-    const val appVersion = "3.13.8"
+    const val appCodeNumber = 547
+    const val appVersion = "3.13.9"
 
     const val gdxVersion = "1.9.14"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index 09e3127306..fdf296288c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,23 @@
+## 3.13.9
+
+Added "permanent visual mods" option to mod management
+
+Resolved #3614 - tileFilter works with natural wonders
+
+More uniform Trade overview
+
+Resolved #3705 - loading game popup stays until the game is loaded
+
+Added "Provides yield without assigned population" uniques to tile improvements
+
+Can now add leader portrait images to mods
+
+Unit name is translated when unit has a unique name
+
+By GGGuenni:
+- More terrainFeature refactoring
+- Toast popup not screen blocking
+
 ## 3.13.8
 
 Resolved #3401, #3598, #3643 - game can be instantly closed and reopened on Android
diff --git a/core/src/com/unciv/ui/cityscreen/YieldGroup.kt b/core/src/com/unciv/ui/cityscreen/YieldGroup.kt
index b92a7524c6..9bf0026b45 100644
--- a/core/src/com/unciv/ui/cityscreen/YieldGroup.kt
+++ b/core/src/com/unciv/ui/cityscreen/YieldGroup.kt
@@ -15,11 +15,11 @@ class YieldGroup : HorizontalGroup() {
     var currentStats=Stats()
 
     fun setStats(stats: Stats) {
-        if(currentStats.equals(stats)) return // don't need to update - this is a memory and time saver!
+        if (currentStats.equals(stats)) return // don't need to update - this is a memory and time saver!
         currentStats = stats
         clearChildren()
-        for (entry in stats.toHashMap().filter { it.value > 0 }) {
-            addActor(getStatIconsTable(entry.key.toString(), entry.value.toInt()))
+        for ((stat, amount) in stats.toHashMap().asSequence().filter { it.value > 0 }) {
+            addActor(getStatIconsTable(stat.name, amount.toInt()))
         }
         pack()
     }
diff --git a/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt b/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
index 983b632ec4..e6a68130cc 100644
--- a/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
+++ b/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
@@ -36,6 +36,7 @@ import kotlin.concurrent.thread
 class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap: TileMap): ZoomableScrollPane() {
     internal var selectedTile: TileInfo? = null
     val tileGroups = HashMap<TileInfo, List<WorldTileGroup>>()
+
     //allWorldTileGroups exists to easily access all WordTileGroups
     //since tileGroup is a HashMap of Lists and getting all WordTileGroups
     //would need a double for loop
@@ -58,7 +59,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
         val mirrorTileGroups = tileGroupMap.getMirrorTiles()
 
         for (tileGroup in daTileGroups) {
-            if (continousScrollingX){
+            if (continousScrollingX) {
                 val mirrorTileGroupLeft = mirrorTileGroups[tileGroup.tileInfo]!!.first
                 val mirrorTileGroupRight = mirrorTileGroups[tileGroup.tileInfo]!!.second
 
@@ -229,7 +230,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
                     return@postRunnable
                 }
 
-                val turnsToGetThere = unitsWhoCanMoveThere.values.max()!!
+                val turnsToGetThere = unitsWhoCanMoveThere.values.maxOrNull()!!
 
                 if (UncivGame.Current.settings.singleTapMove && turnsToGetThere == 1) {
                     // single turn instant move
@@ -250,7 +251,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
     }
 
     private fun addTileOverlays(tileInfo: TileInfo, moveHereDto: MoveHereButtonDto? = null) {
-        for (group in tileGroups[tileInfo]!!){
+        for (group in tileGroups[tileInfo]!!) {
             val table = Table().apply { defaults().pad(10f) }
             if (moveHereDto != null && worldScreen.canChangeState)
                 table.add(getMoveHereButton(moveHereDto))
@@ -293,7 +294,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
         moveHereButton.addActor(numberCircle)
 
 
-        moveHereButton.addActor(dto.unitToTurnsToDestination.values.max()!!.toLabel().apply { center(numberCircle) })
+        moveHereButton.addActor(dto.unitToTurnsToDestination.values.maxOrNull()!!.toLabel().apply { center(numberCircle) })
         val firstUnit = dto.unitToTurnsToDestination.keys.first()
         val unitIcon = if (dto.unitToTurnsToDestination.size == 1) UnitGroup(firstUnit, size / 2)
         else dto.unitToTurnsToDestination.size.toString().toLabel(fontColor = firstUnit.civInfo.nation.getInnerColor()).apply { setAlignment(Align.center) }
@@ -384,10 +385,10 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
     }
 
     private fun updateTilegroupsForSelectedUnit(unit: MapUnit, playerViewableTilePositions: HashSet<Vector2>) {
-        val tileGroup = tileGroups[unit.getTile()]?: return
+        val tileGroup = tileGroups[unit.getTile()] ?: return
         // Entirely unclear when this happens, but this seems to happen since version 520 (3.12.9)
         // so maybe has to do with the construction list being asyc?
-        for (group in tileGroup){
+        for (group in tileGroup) {
             group.selectUnit(unit)
         }
 
@@ -399,7 +400,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
                     unit.movement.getDistanceToTiles().keys.asSequence()
 
         for (tile in tilesInMoveRange) {
-            for (tileToColor in tileGroups[tile]!!){
+            for (tileToColor in tileGroups[tile]!!) {
                 if (isAirUnit)
                     if (tile.aerialDistanceTo(unit.getTile()) <= unit.getRange()) {
                         // The tile is within attack range
@@ -426,9 +427,9 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
         }
 
         for (attackableTile in attackableTiles) {
-            for (tileGroup in tileGroups[attackableTile.tileToAttack]!!){
-                tileGroup.showCircle(colorFromRGB(237, 41, 57))
-                tileGroup.showCrosshair(
+            for (tileGroupToAttack in tileGroups[attackableTile.tileToAttack]!!) {
+                tileGroupToAttack.showCircle(colorFromRGB(237, 41, 57))
+                tileGroupToAttack.showCrosshair(
                         // the targets which cannot be attacked without movements shown as orange-ish
                         if (attackableTile.tileToAttackFrom != unit.currentTile)
                             colorFromRGB(255, 75, 0)
@@ -524,7 +525,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
             }
     }
 
-    fun removeUnitActionOverlay(){
+    fun removeUnitActionOverlay() {
         for (overlay in unitActionOverlays)
             overlay.remove()
         unitActionOverlays.clear()