diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties
index 0280a2c15a..3e8ff86f2e 100644
--- a/android/assets/jsons/translations/Afrikaans.properties
+++ b/android/assets/jsons/translations/Afrikaans.properties
@@ -3345,6 +3345,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -4556,8 +4558,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
  # Requires translation!
 Colossus = 
@@ -5983,8 +5983,6 @@ Ota =
 Tottori = 
  # Requires translation!
 Japan = 
- # Requires translation!
-for [mapUnitFilter]] units = 
 
  # Requires translation!
 Gandhi = 
@@ -10397,8 +10395,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties
index c23121f6f2..2d20223f90 100644
--- a/android/assets/jsons/translations/Belarusian.properties
+++ b/android/assets/jsons/translations/Belarusian.properties
@@ -3652,6 +3652,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -4889,8 +4891,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
  # Requires translation!
 Colossus = 
@@ -6316,8 +6316,6 @@ Ota =
 Tottori = 
  # Requires translation!
 Japan = 
- # Requires translation!
-for [mapUnitFilter]] units = 
 
  # Requires translation!
 Gandhi = 
@@ -10730,8 +10728,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Bosnian.properties b/android/assets/jsons/translations/Bosnian.properties
index 21dc37da4d..09ef28bde3 100644
--- a/android/assets/jsons/translations/Bosnian.properties
+++ b/android/assets/jsons/translations/Bosnian.properties
@@ -3579,6 +3579,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -4816,8 +4818,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
  # Requires translation!
 Colossus = 
@@ -6243,8 +6243,6 @@ Ota =
 Tottori = 
  # Requires translation!
 Japan = 
- # Requires translation!
-for [mapUnitFilter]] units = 
 
  # Requires translation!
 Gandhi = 
@@ -10657,8 +10655,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index 75b3d16472..65e9e2b3fa 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -2034,6 +2034,8 @@ Starts with [tech] = Começa com [tech]
 Starts with [policy] adopted = Começa com [policy] adotada
 Triggers victory = Aciona vitória
 Triggers a Cultural Victory upon completion = Aciona uma Vitória Cultural após a conclusão
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Não pode anexar cidades
 "Borrows" city names from other civilizations in the game = "Empresta" nomes de cidades de outras civilizações no jogo
 Cities are razed [amount] times as fast = As cidades são arrasadas [amount] vezes mais rápido
@@ -2699,7 +2701,6 @@ Mint = Casa da moeda
 Aqueduct = Aqueduto
 
 Heroic Epic = Épica Heróica
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Todas as unidades [baseUnitFilter]] recém-treinadas [cityFilter] recebem a promoção [promotion]
 
 Colossus = Colossos
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Ora, homem, ele supera o mundo estreito como um colosso, e nós, homens mesquinhos andamos embaixo das suas grandes pernas, e espiamos para encontrar-nos túmulos desonrosos.' - William Shakespeare, Júlio César
@@ -3464,7 +3465,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Japão
-for [mapUnitFilter]] units = para unidades [mapUnitFilter]]
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Eu acabei de recerber um informe de que um grande número de minhas tropas cruzaram suas fronteiras.
@@ -5963,7 +5963,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
-Comment [comment] tiles take [] damage] = Comentário [comment] paineis recebem [] dano]
 
 Theodora = Theodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = É sempre uma pena destruir uma coisa bela. Felizmente, você não é um.
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index ddb7fe3e69..c8fd4720ea 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -2669,6 +2669,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -3811,8 +3813,6 @@ Mint = Монетен Двор
 Aqueduct = Акведукт
 
 Heroic Epic = Героичен Епос
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Колос
  # Requires translation!
@@ -4848,8 +4848,6 @@ Ota =
  # Requires translation!
 Tottori = 
 Japan = Япония
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Ганди
 I have just received a report that large numbers of my troops have crossed your borders. = Получих доклад, че голям брой от моите войници са преминали границите ви. 
@@ -8511,8 +8509,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Теодора
  # Requires translation!
diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties
index 67c6612785..0f6b41dadc 100644
--- a/android/assets/jsons/translations/Catalan.properties
+++ b/android/assets/jsons/translations/Catalan.properties
@@ -2041,6 +2041,8 @@ Starts with [tech] = Comença amb [tech].
 Starts with [policy] adopted = Comença amb [policy] ja adoptada.
 Triggers victory = Desencadena victòria
 Triggers a Cultural Victory upon completion = Desencadena la victòria cultural quan es completa
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = No pot annexionar ciutats.
 "Borrows" city names from other civilizations in the game = Agafa «prestats» els noms de les seves ciutats d’altres civilitzacions.
 Cities are razed [amount] times as fast = Les ciutats són arrasades [amount] vegades més ràpid.
@@ -2711,7 +2713,6 @@ Mint = Casa de la moneda
 Aqueduct = Aqüeducte
 
 Heroic Epic = Èpica heroica
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Totes les unitats [baseUnitFilter]] entrenades recentment [cityFilter] reben l’ascens [promotion].
 
 Colossus = Colós
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = «Per què Déu passeja per l’estret món com un colós i nosaltres, homes miserables, caminem per sota les seves cames enormes i anem mirant fins trobar una tomba deshonorable?» ‒ William Shakespeare, Juli Cèsar
@@ -3476,7 +3477,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Japó
-for [mapUnitFilter]] units = per a unitats [mapUnitFilter]]
 
 Gandhi = Mohandas Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Acabo de rebre un informe dient que un gran nombre de les meves tropes han creuat les vostres fronteres.
@@ -5975,7 +5975,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
-Comment [comment] tiles take [] damage] = Comentari: les caselles [comment] reben [] de dany]
 
 Theodora = Teodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Destruir la bellesa sempre és una vergonya. Afortunadament, tu no en tens gens.
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 9b34c66b4f..f3e8db6289 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -2333,6 +2333,8 @@ Starts with [policy] adopted =
 Triggers victory = Vyvolá vítězství
 Triggers a Cultural Victory upon completion = Vyvolá kulturní vítězství po dokončení
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
 "Borrows" city names from other civilizations in the game = "Půjčují" si jména měst od jiných národů ve hře
 Cities are razed [amount] times as fast = Města jsou vypalována [amount] krát rychleji
@@ -3240,8 +3242,6 @@ Mint = Mincovna
 Aqueduct = Akvadukt
 
 Heroic Epic = Památník hrdinů
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Rhodský kolos
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Proč člověk, řídil úzký svět jako kolos, a my drobní muži kráčíme pod jeho obrovskýma nohama, abychom spočinuli v nečestných hrobech.' - William Shakespeare, Julius Caesar
@@ -4008,8 +4008,6 @@ Yamaguchi = Jamaguči
 Ota = Ota
 Tottori = Tottori
 Japan = Japonsko
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Mahátma Gándhí
 I have just received a report that large numbers of my troops have crossed your borders. = Právě jsem obdržel hlášení, že velké množství mých vojáků překročilo vaše hranice.
@@ -6835,8 +6833,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Theodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Vždy je škoda zničit krásnou věc. Naštěstí nejste jeden.
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index 43e9546bf5..dc5691c46c 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -2056,6 +2056,8 @@ Starts with [tech] = Begin het spel met [tech]
 Starts with [policy] adopted = Start met [policy] aangenomen
 Triggers victory = Veroorzaakt een overwinning
 Triggers a Cultural Victory upon completion = Veroorzaakt een Culturele overwinning bij voltooiing
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Mag geen steden innemen
 "Borrows" city names from other civilizations in the game = "Leen" stadsnamen van andere beschavingen in de spelsessie
 Cities are razed [amount] times as fast = Steden worden [amount] keren zo snel verwoest
@@ -2740,8 +2742,6 @@ Mint = Munt
 Aqueduct = Aquaduct
 
 Heroic Epic = Heldenepos
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Kolossus
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Wel man, hij schrijdt de nauwe wereld rond als een kolos, en wij kleine mannen lopen onder zijn enorme benen door en gluren om ons heen om oneervolle graven te vinden.' - William Shakespeare, Julius Caesar
@@ -3506,7 +3506,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori 
 Japan = Japan
-for [mapUnitFilter]] units = voor [mapUnitFilter]] units
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Ik heb zojuist gehoord dat grote hoeveelheden troepen jouw grenzen zijn overgegaan.
@@ -6007,8 +6006,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Theodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Het is altijd een schande iets moois te vernietigen. Gelukkig ben jij niet zoiets.
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index f3c7cdbbaf..4b0c5d6797 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -3775,6 +3775,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -5012,8 +5014,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
  # Requires translation!
 Colossus = 
@@ -6439,8 +6439,6 @@ Ota =
 Tottori = 
  # Requires translation!
 Japan = 
- # Requires translation!
-for [mapUnitFilter]] units = 
 
  # Requires translation!
 Gandhi = 
@@ -10849,8 +10847,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index 5e0394c7da..6d99dab3be 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -2196,6 +2196,8 @@ Starts with [policy] adopted = Nagsisimula sa pagtibay ng [policy]
 Triggers victory = Nagpapagana ng tagumpay
 Triggers a Cultural Victory upon completion = Nag-trigger ng Kultural na Tagumpay kapag natapos na
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
 "Borrows" city names from other civilizations in the game = "Humihiram" ng mga pangalan ng lungsod sa ibang sibilisasyon sa laro
 Cities are razed [amount] times as fast = Mga lungsod ay winawasak nang [amount] na beses na bilis
@@ -2975,8 +2977,6 @@ Mint = Gawaan ng Kulwaltang Metal
 Aqueduct = Akwedukto
 
 Heroic Epic = Epiko ng Kabayanihan
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Colossus
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Bakit tao, siya ay pinakamahusay na sumakay sa makitid na mundo tulad ng isang higanteng tao, at kaming mga maliliit na tao ay naglalakad sa ilalim ng kanyang malalaking paa, at sumilip upang mahanap ang ating mga sarili na walang galang na libingan.' - William Shakespeare, Julius Caesar
@@ -3742,8 +3742,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Hapon
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Nakatanggap lang ako ng isang ulat na ang malaking bilang ng aking mga tropa ay tumawid sa iyong mga nasasakupan.
@@ -6251,8 +6249,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Theodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Ito ay palaging isang kahihiyan upang sirain ang isang bagay ng kagandahan. Sa kabutihang palad, hindi ka isa sa mga iyon.
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index 1e4ee6fc79..5d17736769 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -2808,6 +2808,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -3947,8 +3949,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Rodoksen kolossi
  # Requires translation!
@@ -4763,8 +4763,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Japani
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Olen juuri saanut raportin että lukuisat sotilaani ovat ylittäneet rajasi.
@@ -8761,8 +8759,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index d45348b3e1..849d214c8b 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -768,7 +768,6 @@ Unit icon opacity = Opacité de l'icône des unités
 
 ### Performance subgroup
 
- # Requires translation!
 Performance = Performance
 Continuous rendering = Rendu en continu
 When disabled, saves battery life but certain animations will be suspended = Lorsque désactivé, permet d'économiser la batterie mais certaines animations seront suspendues
@@ -786,7 +785,6 @@ Automated units can upgrade = Les unités automatisées peuvent s'améliorer ell
 Automated units choose promotions = Les unités automatisées choisissent leurs promotions
 Order trade offers by amount = Classer les offres d'échange par valeur
 Ask for confirmation when pressing next turn = Demander confirmation pour passer au tour suivant
- # Requires translation!
 EXPERIMENTAL movement - use at your own risk! = Déplacement EXPÉRIMENTAL - Avertissement !
 Notifications log max turns = Tours max. dans le journal de notifications
 
@@ -1793,11 +1791,8 @@ Download [modName] = Télécharger [modName]
 Update [modName] = Mettre à jour [modName]
 Could not download mod list = Impossible de charger la liste des mods
 Download mod from URL = Télécharger un mod depuis l'URL
- # Requires translation!
 Please enter the mod repository -or- archive zip -or- branch -or- release url: = URL de dépôt, ou du fichier zip, ou de la branche du mod, ou de partage :
- # Requires translation!
 That is not a valid ZIP file = Fichier Zip non valide
- # Requires translation!
 Invalid Mod archive structure = Structure de l'archive du mod non valide
 Invalid link! = Lien non valide !
 Paste from clipboard = Coller depuis le presse-papier
@@ -2039,6 +2034,8 @@ Starts with [tech] = Débute avec [tech]
 Starts with [policy] adopted = Démarre avec la doctrine [policy] adoptée
 Triggers victory = Déclenche la victoire
 Triggers a Cultural Victory upon completion = Déclenche une Victoire Culturelle une fois achevé
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Ne peut pas annexer les villes
 "Borrows" city names from other civilizations in the game = "Emprunte" les noms des villes aux autres civilisations de la partie
 Cities are razed [amount] times as fast = Les villes sont rasées [amount] fois plus vite
@@ -2229,7 +2226,6 @@ Irremovable = Insupprimable
 Will be replaced by automated workers = Sera remplacé par les ouvriers automatisés
 for [amount] turns = pour [amount] tours
 with [amount]% chance = avec [amount]% de chances
- # Requires translation!
 every [positiveAmount] turns = tous les [positiveAmount] tours
 before [amount] turns = avant [amount] tours
 after [amount] turns = après [amount] tours
@@ -2423,7 +2419,6 @@ Coastal = Côtière(s)
 River = Rivière
 Open terrain = Terrain dégagé
 Water resource = Ressource aquatique
- # Requires translation!
 resource = ressource
 Foreign Land = Territoire Étranger
 Foreign = Étrangère(s)
@@ -2441,7 +2436,6 @@ Bonus resource = Ressource bonus
 ######### Tile Filters ###########
 
 unimproved = non-aménagée(s)
- # Requires translation!
 improved = aménagée(s)
 All Road = Toute Route
 
@@ -2707,7 +2701,6 @@ Mint = Hôtel de la Monnaie
 Aqueduct = Aqueduc
 
 Heroic Epic = Épopée Héroïque
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Toutes les unités [baseUnitFilter]] nouvellement formées [cityFilter] reçoivent la promotion [promotion]
 
 Colossus = Colosse
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Eh ! Ami, il enjambe cet étroit univers comme un colosse, et nous autres, hommes chétifs, nous passons sous ses jambes énormes et nous furetons partout pour trouver des tombes déshonorées.' - William Shakespeare, Julius Caesar
@@ -3472,7 +3465,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Japon
-for [mapUnitFilter]] units = pour les unités [mapUnitFilter]]
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = On vient de me rapporter que mes troupes ont franchi vos frontières en grand nombre.
@@ -5971,7 +5963,6 @@ Sabratha = Sabratha
 Rusadir = Russadir
 Baecula = Baecula
 Saldae = Saldae
-Comment [comment] tiles take [] damage] = Comment [comment] tiles take [] damage]
 
 Theodora = Théodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Il est toujours regrettable de détruire la beauté. Heureusement, vous n'en faites pas partie.
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 1a7b216956..5ee54a94c8 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -2057,6 +2057,8 @@ Starts with [tech] = Startet mit [tech]
 Starts with [policy] adopted = Startet mit bereits verabschiedeter [policy] Politik
 Triggers victory = Löst den Sieg aus
 Triggers a Cultural Victory upon completion = Bei Fertigstellung wird der Kultursieg erreicht
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Darf keine Städte annektieren
 "Borrows" city names from other civilizations in the game = "Leiht" sich Städtenamen von anderen Zivilisationen im Spiel
 Cities are razed [amount] times as fast = Städte werden [amount] mal schneller ausgelöscht
@@ -2741,8 +2743,6 @@ Mint = Prägeanstalt
 Aqueduct = Aquädukt
 
 Heroic Epic = Heldenepos
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Koloss
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Warum der Mann, der die schmale Welt wie ein Koloss durchquert, und wir unbedeutenden Männer gehen unter seinen riesigen Beinen hindurch und schauen herum, um uns in unehrenhafte Gräber zu stürzen.'  - William Shakespeare, Julius Caesar
@@ -3507,8 +3507,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Japan
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Mahatma Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Ich habe gerade gehört, dass viele Truppen von mir Ihre Grenzen übertreten haben.
@@ -6008,8 +6006,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Theodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Es ist immer eine Schande, ein Stück von Schönheit zu zerstören. Glücklicherweise seid ihr keines.
diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties
index 858fc3a927..066d0a284f 100644
--- a/android/assets/jsons/translations/Greek.properties
+++ b/android/assets/jsons/translations/Greek.properties
@@ -3391,6 +3391,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -4567,8 +4569,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Κολοσσός 
  # Requires translation!
@@ -5817,8 +5817,6 @@ Ota =
  # Requires translation!
 Tottori = 
 Japan = Ιαπωνία
- # Requires translation!
-for [mapUnitFilter]] units = 
 
  # Requires translation!
 Gandhi = 
@@ -10063,8 +10061,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 4954652622..9853e64286 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -2114,6 +2114,8 @@ Starts with [tech] = [tech] feltalálva kezdéskor
 Starts with [policy] adopted = A(z) [policy] eszme beiktatásával kezdődik
 Triggers victory = Győzelmet idéz elő
 Triggers a Cultural Victory upon completion = Kulturális győzelmet idéz elő, ha megvalósul
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Nem csatolhat városokat
 "Borrows" city names from other civilizations in the game = A játékban található más civilizációktól "szerzi be" a városainak a nevét 
 Cities are razed [amount] times as fast = Gyorsabb a városok elbontása (×[amount])
@@ -2839,8 +2841,6 @@ Mint = Pénzverde
 Aqueduct = Vízvezeték
 
 Heroic Epic = Hősi Eposz
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Rodoszi kolosszus
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Ó miért, miért van az, hogy ő kolosszusként járja e szűk világot, mi, szegény emberek pedig hatalmas lábai alatt vagyunk, és ha magunkra tekintünk, csak meggyalázott sírokat látunk?' - William Shakespeare, Julius Caesar
@@ -3632,8 +3632,6 @@ Yamaguchi = Yamaguchi
 Ota = Óta
 Tottori = Tottori
 Japan = Japán
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Mahátma Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Most kaptam a jelentést, hogy nagy létszámú seregem lépte át a határaitokat.
@@ -6946,8 +6944,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Theodóra
  # Requires translation!
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 673df05288..3511c676c1 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -2067,6 +2067,8 @@ Starts with [tech] = Memulai dengan [tech]
 Starts with [policy] adopted = Memulai dengan kebijakan [policy]
 Triggers victory = Memicu kemenangan
 Triggers a Cultural Victory upon completion = Memicu Kemenangan Kebudayaan saat diselesaikan
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Tidak boleh mencaplok kota
 "Borrows" city names from other civilizations in the game = "Meminjam" nama-nama kota dari peradaban lain di gim
 Cities are razed [amount] times as fast = Kota diruntuhkan [amount] kali lebih cepat
@@ -2754,8 +2756,6 @@ Mint = Percetakan Uang Logam
 Aqueduct = Saluran Air
 
 Heroic Epic = Epik Kepahlawanan
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Kolossus
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Mengapa, dia duduk mengangkang di dunia yang sempit seperti patung raksasa, dan kita manusia remeh berjalan di bawah kakinya yang besar, dan mengintip hanya untuk menemukan diri sendiri di kubur yang tidak terhormat.' - William Shakespeare, Julius Caesar
@@ -3520,8 +3520,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Jepang
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Baru saja aku menerima laporan bahwa banyak pasukanku telah melintasi perbatasanmu.
@@ -6029,8 +6027,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Theodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Adalah hal yang memalukan jika seseorang menghancurkan sesuatu yang indah. Untungnya, kamu bukanlah hal yang indah.
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index 19cd92ca9e..cf251a5fee 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -2039,6 +2039,8 @@ Starts with [tech] = Cominci con la tecnologia [tech]
 Starts with [policy] adopted = Comincia adottando la politica [policy]
 Triggers victory = Attiva la vittoria
 Triggers a Cultural Victory upon completion = Attiva una Vittoria Culturale quando completata
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Non può annettere città
 "Borrows" city names from other civilizations in the game = Puoi "prendere in prestito" i nomi delle città da altre civiltà presenti nel gioco.
 Cities are razed [amount] times as fast = Radere al suolo una città è [amount] volte più veloce
@@ -2708,7 +2710,6 @@ Mint = Zecca
 Aqueduct = Acquedotto
 
 Heroic Epic = Poema eroico
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Tutte le unità [baseUnitFilter]] addestrate [cityFilter] ricevono la promozione [promotion]
 
 Colossus = Colosso
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Già, lui cavalca questo stretto mondo ormai come un colosso; e noi, gli omuncoli, passiamo sotto le sue gambe enormi e ci scrutiamo intorno, per ritrovarci tutti quanti siamo come tanti sepolcri senza onore' - William Shakespeare: Giulio Cesare
@@ -3473,7 +3474,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Giappone
-for [mapUnitFilter]] units = per le unità [mapUnitFilter]]
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Posso dichiarare guerra senza sacrificare morali! Non chiedermi come: non capiresti.
@@ -5972,8 +5972,6 @@ Sabratha = Sabrata
 Rusadir = Rusadir
 Baecula = Becula
 Saldae = Saldae
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Teodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = È sempre un peccato distruggere un oggetto di bellezza... ma sono lieta che tu non lo sia.
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index 6f6aaee0bb..53e8f10e15 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -2123,6 +2123,8 @@ Starts with [tech] = [tech]で始まる
 Starts with [policy] adopted = [policy]を採用した状態で始まる
 Triggers victory = 勝利を収める
 Triggers a Cultural Victory upon completion = 完成すると文化勝利を収められる
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = 都市を併合することができない
 "Borrows" city names from other civilizations in the game = 都市の建設時に他の文明の都市名を借りる
 Cities are razed [amount] times as fast = 都市の焼却速度が[amount]倍
@@ -2967,8 +2969,6 @@ Mint = 造幣所
 Aqueduct = 用水路
 
 Heroic Epic = 英雄叙事詩
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = ロードス島の巨神像
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 「いいか、あの男は狭い世界に、まるで巨神像のようにまたがっている。われわれ卑小な人間は、あの男の大きな股の下をくぐって、不名誉な墓を探しまわっているのだ。」 - ウィリアム・シェイクスピア:ジュリアス・シーザー
@@ -3751,8 +3751,6 @@ Yamaguchi = 山口
 Ota = 大田
 Tottori = 鳥取
 Japan = 日本
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = ガンジー
 I have just received a report that large numbers of my troops have crossed your borders. = たった今、我が国の大軍があなたの国境を越えたとの報告がありました。
@@ -6464,8 +6462,6 @@ Sabratha = サブラタ
 Rusadir = ルサディル
 Baecula = ベキュラ
 Saldae = サルデー
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = テオドラ
  # Requires translation!
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 9d8991fa0e..3638155d4e 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -788,7 +788,6 @@ Automated units can upgrade = 자동화된 유닛 업그레이드 가능
 Automated units choose promotions = 자동화된 유닛 승급 선택
 Order trade offers by amount = 거래 품목 갯수순 정렬
 Ask for confirmation when pressing next turn = 턴 넘길 때 확인
- # Requires translation!
 EXPERIMENTAL movement - use at your own risk! = 경고: 불안정한 실험 기능입니다!
 Notifications log max turns = 알림 보관 기간
 
@@ -1286,9 +1285,7 @@ Add to the top of the queue = 대기열 최상단에 추가
 Add to the queue in all cities = 모든 도시 대기열에 추가
 Add or move to the top in all cities = 모든 도시 대기열 최상단으로 이동 또는 추가
 Remove from the queue in all cities = 모든 도시 대기열에서 제거
- # Requires translation!
 Disable = 비활성화
- # Requires translation!
 Enable = 활성화
 
 # Specialized Popups - Ask for text or numbers, file picker
@@ -1592,7 +1589,6 @@ Resource [resource] does not exist in ruleset! = [resource] 자원이 룰셋에
 Improvement [improvement] does not exist in ruleset! = [improvement] 시설이 룰셋에 없습니다!
 Nation [nation] does not exist in ruleset! = [nation] 문명이 룰셋에 없습니다!
 Natural Wonder [naturalWonder] does not exist in ruleset! = [naturalWonder] 자연 불가사의가 룰셋에 없습니다!
- # Requires translation!
 non-[filter] = 비 [filter]
 
 # Civilopedia difficulty levels
@@ -1661,27 +1657,17 @@ Needs removal of terrain features to be built = 추가지형을 삭제해야만
 Unit type = 유닛 유형
 Units: = 유닛:
 Unit types = 유닛 유형
- # Requires translation!
 Domain: [param] = 영역: [param]
 Toggle UI (World Screen only) = 세계 화면 UI 보이기/숨기기
- # Requires translation!
 Overrides yields from underlying terrain = 아래 지형의 산출량을 더하지 않음
- # Requires translation!
 No yields = 산출량 없음
 Mod: [modname] = 모드: [modname]
- # Requires translation!
 Search text: = 검색어:
- # Requires translation!
 Invalid regular expression = 유효하지 않은 정규 표현식입니다.
- # Requires translation!
 Mod filter: = 모드 필터
- # Requires translation!
 -Combined- = - 전체 -
- # Requires translation!
 Search! = 검색
- # Requires translation!
 Results = 결과
- # Requires translation!
 Nothing found! = 검색 결과 없음
 
 # Policies
@@ -1736,9 +1722,7 @@ Religion: Off = 종교 비활성화됨
 Minimal Faith required for\nthe next [Great Prophet]: = 다음 [Great Prophet] 출현에 필요한 최소 신앙:
 Religions to be founded: [amount] = 창시 가능한 종교의 수: [amount]
 Available religion symbols = 사용 가능한 종교 마크
- # Requires translation!
 Number of civilizations * [amount] + [amount2] = 전체 문명 수 * [amount] + [amount2]
- # Requires translation!
 Estimated Number of civilizations * [amount] + [amount2] = 추정 문명 수 * [amount] + [amount2]
 Religions already founded = 이미 창시된 종교
 Available founder beliefs = 선택 가능한 창시자 교리
@@ -1770,7 +1754,6 @@ Your spy [name] cannot steal any more techs from [civilization] as we've already
 
 After the city of [cityName] was destroyed, your spy [spyName] has fled back to our hideout. = [cityName]이(가) 파괴되어 아군 스파이 [spyName]이(가) 은신처로 철수했습니다.
 After the city of [cityName] was conquered, your spy [spyName] has fled back to our hideout. = [cityName]이(가) 정복되어 아군 스파이 [spyName]이(가) 은신처로 철수했습니다.
- # Requires translation!
 Due to the chaos ensuing in [cityName], your spy [spyname] has fled back to our hideout. = [cityName]에 계속된 혼란으로 아군 [spyname]이(가) 은신처로 철수했습니다.
 
 # Promotions
@@ -2078,6 +2061,8 @@ Starts with [tech] = [tech] 기술을 가지고 시작함
 Starts with [policy] adopted = [policy] 채택한 상태로 시작
 Triggers victory = 승리를 촉발함
 Triggers a Cultural Victory upon completion = 건설시 문화 승리를 거둠
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = 도시 합병 불가
 "Borrows" city names from other civilizations in the game = 다른 문명의 도시 이름을 빌려 사용함
 Cities are razed [amount] times as fast = 도시를 불태우는 속도 [amount]배
@@ -2834,8 +2819,6 @@ Mint = 조폐국
 Aqueduct = 송수로
 
 Heroic Epic = 영웅적 서사시
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = 로도스의 거상
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = '그는 그 좁은 세상에 거신상처럼 우뚝 서 있고, 우리 하찮은 자들은 그 거대한 다리 사이를 지나다니며 부끄러운 무덤자리를 봐두려고 주변을 힐끔거리지.'-윌리엄 셰익스피어, 줄리어스 시저 1막 2장
@@ -3600,8 +3583,6 @@ Yamaguchi = 야마구치
 Ota = 오타
 Tottori = 돗토리
 Japan = 일본
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = 간디
 I have just received a report that large numbers of my troops have crossed your borders. = 방금 많은 수의 군대가 당신의 국경에 들어갔다는 보고를 받았습니다.
@@ -6109,8 +6090,6 @@ Sabratha = 사브라타
 Rusadir = 루사디르
 Baecula = 베쿨라
 Saldae = 살대
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = 테오도라
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = 아름다운 사람을 죽여야 할 때면 내 마음이 안타깝지만, 당신은 아름답지 않아서 다행이야.
@@ -6853,3 +6832,4 @@ In the Resources overview, click on a resource icon to center the world screen o
 Alternatively, click on the "Unimproved" number to center the world screen only on owned tiles where the resource is not improved. = 
  # Requires translation!
 If more than one tile is available, click repeatedly on the notification to cycle through all of them. = 
+
diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties
index a02a0e3beb..67210dbcad 100644
--- a/android/assets/jsons/translations/Latin.properties
+++ b/android/assets/jsons/translations/Latin.properties
@@ -3524,6 +3524,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -4732,8 +4734,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
  # Requires translation!
 Colossus = 
@@ -6136,8 +6136,6 @@ Ota =
 Tottori = 
  # Requires translation!
 Japan = 
- # Requires translation!
-for [mapUnitFilter]] units = 
 
  # Requires translation!
 Gandhi = 
@@ -10439,8 +10437,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index adc6038c01..236636160c 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -2305,6 +2305,8 @@ Starts with [policy] adopted = Pradeda su: [policy]
 Triggers victory = Suaktyvina pergalę
 Triggers a Cultural Victory upon completion = Kultūrinė pergalė užbaigus
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
 "Borrows" city names from other civilizations in the game = "Skolinasi" miestų pavadinimus iš kitų
 Cities are razed [amount] times as fast = Miestai griaunami [amount] kartų greičiau
@@ -3139,8 +3141,6 @@ Mint = Monetų kalykla
 Aqueduct = Vandens kanalai
 
 Heroic Epic = Heroinis epas
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Kolosas
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Tu, o karaliau, matei regėjimą. Štai prieš akis didžiulė statula. Ši statula buvo milžiniška, nepaprasto spindesio. Ji stovėjo prieš tave, ir jos išvaizda kėlė baimę.' - Danielio 2:31
@@ -3906,8 +3906,6 @@ Yamaguchi = Jamaguti
 Ota = Ota
 Tottori = Tottori
 Japan = Japonija
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gandi
 I have just received a report that large numbers of my troops have crossed your borders. = Man jau pranešė, kad didžiulė mano armija peržengė jūsų sienas.
@@ -6416,8 +6414,6 @@ Sabratha = Sabrata
 Rusadir = Rusadir
 Baecula = Bekula
 Saldae = Saldai
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Teodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Visada labai gaila sunaikinti kažką gražaus. Laimei, jūs tokiems nepriklausote.
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index 0adc167e0a..5adc0dc470 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -2721,6 +2721,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -3875,8 +3877,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
  # Requires translation!
 Colossus = 
@@ -5240,8 +5240,6 @@ Ota =
  # Requires translation!
 Tottori = 
 Japan = Jepun
- # Requires translation!
-for [mapUnitFilter]] units = 
 
  # Requires translation!
 Gandhi = 
@@ -9434,8 +9432,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index c37af7861c..cc68e9b29c 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -3171,6 +3171,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -4358,8 +4360,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Tandis
  # Requires translation!
@@ -5773,8 +5773,6 @@ Ota =
 Tottori = 
  # Requires translation!
 Japan = 
- # Requires translation!
-for [mapUnitFilter]] units = 
 
  # Requires translation!
 Gandhi = 
@@ -10158,8 +10156,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index b7f65d0fae..43d1654701 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -2742,6 +2742,8 @@ Triggers victory =
  # Requires translation!
 Triggers a Cultural Victory upon completion = 
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -3884,8 +3886,6 @@ Aqueduct =
 
  # Requires translation!
 Heroic Epic = 
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Tandis
  # Requires translation!
@@ -5201,8 +5201,6 @@ Ota =
  # Requires translation!
 Tottori = 
 Japan = Jaapon
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gaandi
  # Requires translation!
@@ -9386,8 +9384,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index 057d647c5e..4dc1679de3 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -2041,6 +2041,8 @@ Starts with [tech] = Na start otrzymuje technologię [tech]
 Starts with [policy] adopted = Rozpoczyna z przyjętą polityką: [policy]
 Triggers victory = Zainicjuj zwycięstwo
 Triggers a Cultural Victory upon completion = Zakończenie oznacza Zwycięstwo Kulturowe
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Nie można zaanektować miast
 "Borrows" city names from other civilizations in the game = „Zapożycza” nazwy miast od innych cywilizacji
 Cities are razed [amount] times as fast = Miasta są niszczone [amount] razy szybciej
@@ -2711,7 +2713,6 @@ Mint = Mennica
 Aqueduct = Akwedukt
 
 Heroic Epic = Epos Heroiczny
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Wszystkie nowe jednostki [baseUnitFilter] [cityFilter] otrzymują awans [promotion] 
 
 Colossus = Kolos
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = „Człowiek ten stanął okrakiem nad światem jak Kolos, gdy my, ludzie malusieńcy, spod jego wielkich nóg zerkamy wokół, szukając sobie upodlonych grobów.”\n\n– William Szekspir (Juliusz Cezar)
@@ -3476,7 +3477,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Japonia
-for [mapUnitFilter]] units = dla jednostek [mapUnitFilter] 
 
 Gandhi = Mahatma Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Otrzymałem właśnie raport, że duża liczba moich żołnierzy przekroczyła wasze granice.
@@ -5975,8 +5975,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Teodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Zawsze szkoda zniszczyć coś pięknego. Na szczęście nie jesteś jednym.
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index 526a5f0611..ec71efbd2c 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -2306,6 +2306,8 @@ Starts with [policy] adopted =
 Triggers victory = 
 Triggers a Cultural Victory upon completion = Desencadeia uma vitória cultural após a conclusão
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -3308,8 +3310,6 @@ Mint = Casa da moeda
 Aqueduct = Aqueduto
 
 Heroic Epic = Épico Heróico
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Colossos
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Ora, homem, ele supera o mundo estreito como um colosso, e nós, homens desprezíveis andamos de baixo das suas grandes pernas, e espiamos para encontrar-nos túmulos desonrosos.' - William Shakespeare, Júlio César
@@ -4075,8 +4075,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Japão
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Eu acabei de recerber um informe de que um grande número de minhas tropas cruzaram as tuas fronteiras.
@@ -7678,8 +7676,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
  # Requires translation!
 Theodora = 
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index 76871b02f0..861639edf3 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -2206,6 +2206,8 @@ Starts with [policy] adopted =
 Triggers victory = Declanșează victoria
 Triggers a Cultural Victory upon completion = Declanșează o victorie culturală la finalizare
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
  # Requires translation!
 "Borrows" city names from other civilizations in the game = 
@@ -3113,8 +3115,6 @@ Mint = Fabrică de bani
 Aqueduct = Apeduct
 
 Heroic Epic = Epopee eroică
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Colosul
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = „De ce oare el străbate lumea ca un colos, și noi, oameni mici, mergem pe sub picioarele lui gigantice și vedem să ne găsim morminte dizonorabile.” - William Shakespeare, Iulius Caesar
@@ -3879,8 +3879,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Japonia
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Tocmai am primit un raport că un număr mare dintre trupele mele au trecut granițele tale.
@@ -6798,8 +6796,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Teodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Este un păcat să distrugi un lucru frumos. Din fericire, tu nu ești unul.
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index b23b78441a..954aad0ceb 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -2046,6 +2046,8 @@ Starts with [tech] = Начинает с технологией [tech]
 Starts with [policy] adopted = Начинает с принятым институтом [policy]
 Triggers victory = Приводит к победе
 Triggers a Cultural Victory upon completion = Приводит к культурной победе при завершении
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Не может аннексировать города
 "Borrows" city names from other civilizations in the game = "Одалживает" названия городов у других цивилизаций в игре
 Cities are razed [amount] times as fast = Города разрушаются в [amount] раз(а) быстрее
@@ -2720,7 +2722,6 @@ Mint = Монетный двор
 Aqueduct = Акведук
 
 Heroic Epic = Героический эпос
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Все новообученные юниты [baseUnitFilter]] в [cityFilter] получают повышение [promotion]
 
 Colossus = Колосс
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'По миру тесному шагает колосс, а мы, ничтожные людишки, у исполинских ног его снуем и для себя могил бесславных ищем.' - Уильям Шекспир, 'Юлий Цезарь'
@@ -3485,7 +3486,6 @@ Yamaguchi = Ямагути
 Ota = Ота
 Tottori = Тоттори
 Japan = Япония
-for [mapUnitFilter]] units = для [mapUnitFilter] юнитов
 
 Gandhi = Ганди
 I have just received a report that large numbers of my troops have crossed your borders. = Мне только что доложили, что моя огромная армия пересекла ваши границы.
@@ -5985,8 +5985,6 @@ Sabratha = Сабрата
 Rusadir = Русадир
 Baecula = Бекула
 Saldae = Сальды
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Феодора
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Всегда стыдно разрушать прекрасное. К счастью, к таковым вы не относитесь.
diff --git a/android/assets/jsons/translations/Rusyn.properties b/android/assets/jsons/translations/Rusyn.properties
index 4c72164e19..a99d7977ee 100644
--- a/android/assets/jsons/translations/Rusyn.properties
+++ b/android/assets/jsons/translations/Rusyn.properties
@@ -3150,6 +3150,8 @@ Starts with [tech] = Зачинат бавити из технолоґійов [
 Starts with [policy] adopted = Зачинат ся, кой узято [policy]
 Triggers victory = Описат побіду
 Triggers a Cultural Victory upon completion = Культурна побіда по дочиненьові ставбы
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Не годен анексовати вароші
 "Borrows" city names from other civilizations in the game = "Зычит" имена варошам уд другых цівілізацій у бавці
 Cities are razed [amount] times as fast = Вароші паляь ся у [amount] раз май скоро
@@ -4066,8 +4068,6 @@ Mint = Монетарня
 Aqueduct = Аквадукт
 
 Heroic Epic = Вітязськый Епос
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Колос Родоса
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = "Так, мій друже. Він мов Колос, піднявсь над бідним світом. А ми, маленькі, ходимо під тяжкими його ногами й виглядаєм місця, де б у ганебній опочіть могилі" — Вільям Шекспір, Юлій Цезар.
@@ -4876,8 +4876,6 @@ Yamaguchi = Ямаґучі
 Ota = Ота
 Tottori = Тотторі
 Japan = Японія
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Ґанді
 I have just received a report that large numbers of my troops have crossed your borders. = Я тільки-но дізнався, що велика кількість моїх воїнів перейшла через ваші кордони.
@@ -7587,8 +7585,6 @@ Sabratha = Сабрата
 Rusadir = Русадір
 Baecula = Бекула
 Saldae = Салде
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Фтеодора
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Так журно нищити красиві речі. На щастя, ты не из такых.
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index aabe936e45..a934e000b6 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -2036,6 +2036,8 @@ Starts with [tech] = 初始即拥有科技：[tech]
 Starts with [policy] adopted = 游戏开始时就推行[policy]
 Triggers victory = 触发胜利
 Triggers a Cultural Victory upon completion = 完成后触发文化胜利
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = 可能不会吞并城市
 "Borrows" city names from other civilizations in the game = 从其他文明借用城市名
 Cities are razed [amount] times as fast = [amount] 倍城市拆除速度
@@ -2701,7 +2703,6 @@ Mint = 铸币厂
 Aqueduct = 引水渠
 
 Heroic Epic = 英雄史诗
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 所有[cityFilter]新训练的 [baseUnitFilter] 单位都会获得 [promotion] 晋升
 
 Colossus = 太阳神巨像
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = “嘿，老兄，他像一个巨人似的跨越这狭隘的世界；我们这些渺小的凡人一个个在他粗大的两腿下行走，四处张望着，替自己寻找不光荣的坟墓。” —— 威廉 · 莎士比亚：《尤利乌斯 · 恺撒》
@@ -3466,7 +3467,6 @@ Yamaguchi = 山口
 Ota = 大田
 Tottori = 鸟取
 Japan = 日本
-for [mapUnitFilter]] units = 对于 [mapUnitFilter] 单位
 
 Gandhi = 甘地
 I have just received a report that large numbers of my troops have crossed your borders. = 我刚刚接到报告...我的部队已经来到你的领土 “做客” 了。
@@ -5965,8 +5965,6 @@ Sabratha = 萨布拉塔
 Rusadir = 鲁萨迪尔
 Baecula = 贝库拉
 Saldae = 萨尔达伊
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = 狄奥多拉
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = 破坏一件美丽的东西总是一种耻辱。幸运的是，你不是。
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index ccc84e7f8d..e007700199 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -768,7 +768,6 @@ Unit icon opacity = Transparencia de los iconos de Unidad
 
 ### Performance subgroup
 
- # Requires translation!
 Performance = Rendimiento
 Continuous rendering = Renderizado Continuo
 When disabled, saves battery life but certain animations will be suspended = Cuando está deshabilitado ahorra batería, pero se desactivan ciertas animaciones
@@ -786,7 +785,6 @@ Automated units can upgrade = Unidades automatizadas se mejoran solas
 Automated units choose promotions = Unidades automatizadas escogen sus promociones
 Order trade offers by amount = Ordenar ofertas comerciales por cantidad
 Ask for confirmation when pressing next turn = Confirmación al presionar "⏳Siguiente Turno"
- # Requires translation!
 EXPERIMENTAL movement - use at your own risk! = Movimiento EXPERIMENTAL - ¡Use bajo su propio riesgo!
 Notifications log max turns = Máximo de guardados de notificaciones por ⏳turno
 
@@ -1261,10 +1259,8 @@ Unlock = Desbloquear
 Move to city = Mover a ciudad
 Reset Citizens = Recolocar Ciudadanos
 Citizen Management = Administración de ciudadanos
- # Requires translation!
 Citizen Focus = Enfoque Ciudadano
 Avoid Growth = Evitar el Crecimiento
- # Requires translation!
 Manual = Manual
 Please enter a new name for your city = Por favor introduce un nuevo nombre para tu ciudad
 Please select a tile for this building's [improvement] = Por favor, selecciona una casilla para la mejora [improvement] de este edificio
@@ -1795,11 +1791,8 @@ Download [modName] = Descargar [modName]
 Update [modName] = Actualizar [modName]
 Could not download mod list = No se pudo descargar la lista de mods
 Download mod from URL = Descargar mod con Enlace
- # Requires translation!
 Please enter the mod repository -or- archive zip -or- branch -or- release url: = Por favor ingrese el link del repositorio / archivo zip / rama / edición del mod:
- # Requires translation!
 That is not a valid ZIP file = Este no es un archivo ZIP válido
- # Requires translation!
 Invalid Mod archive structure = Estructura del archivo del mod inválida
 Invalid link! = ¡Enlace invalido!
 Paste from clipboard = Pegar del Portapapeles
@@ -2041,6 +2034,8 @@ Starts with [tech] = Comienza con [tech]
 Starts with [policy] adopted = Comienza con [policy] adoptada
 Triggers victory = Activa la victoria
 Triggers a Cultural Victory upon completion = Activa una victoria cultural al completarse
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = No puede anexar ciudades
 "Borrows" city names from other civilizations in the game = "Toma prestado" nombres de ciudades de otras civilizaciones en el juego
 Cities are razed [amount] times as fast = La Ciudades son destruídas [amount] veces más rápido
@@ -2091,7 +2086,6 @@ Can perform Air Sweep = Puede hacer un Barrido Aéreo
 Can speed up construction of a building = Puede acelerar la construcción de un edificio
 Can speed up the construction of a wonder = Puede acelerar la construcción de una maravilla
 Can hurry technology research = Puede acelerar investigaciones
- # Requires translation!
 Can generate a large amount of culture = Puede generar una gran cantidad de cultura
 Can undertake a trade mission with City-State, giving a large sum of gold and [amount] Influence = Puede realizar una ruta de comercio con una Ciudad-estado dando una gran cantidad de oro y [amount] de Influencia
 Can transform to [unit] = Puede convertirse en [unit]
@@ -2160,7 +2154,6 @@ Earn [amount]% of [mapUnitFilter] unit's [costOrStrength] as [civWideStat] when
 May capture killed [mapUnitFilter] units = Puede capturar unidades [mapUnitFilter] eliminadas
 [amount] XP gained from combat = [amount] EXP obtenido del combate
 [relativeAmount]% XP gained from combat = [relativeAmount]% EXP ganada del combate
- # Requires translation!
 Can be earned through combat = Puede obtenerse mediante el combate
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] se gana [relativeAmount]% más rápido
 Invisible to non-adjacent units = Invisible para unidades no-adyacentes
@@ -2233,7 +2226,6 @@ Irremovable = Inremovible
 Will be replaced by automated workers = Será reemplazada por trabajadores automatizados
 for [amount] turns = Por [amount] ⏳turnos
 with [amount]% chance = con una probabilidad de [amount]%
- # Requires translation!
 every [positiveAmount] turns = cada [positiveAmount] turnos
 before [amount] turns = antes de [amount] ⏳turnos
 after [amount] turns = después de [amount] ⏳turnos
@@ -2427,7 +2419,6 @@ Coastal = Costera
 River = Río
 Open terrain = Terreno Abierto
 Water resource = Recurso de Agua
- # Requires translation!
 resource = recurso
 Foreign Land = Tierra Extranjera
 Foreign = Extranjera
@@ -2445,7 +2436,6 @@ Bonus resource = Recurso Bonus
 ######### Tile Filters ###########
 
 unimproved = no mejoradas
- # Requires translation!
 improved = mejoradas
 All Road = Todas las Vías
 
@@ -2711,7 +2701,6 @@ Mint = Casa de la moneda
 Aqueduct = Acueducto
 
 Heroic Epic = Épica Heroica
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Todas las unidades [baseUnitFilter]] recién entrenadas [cityFilter] reciben la promoción [promotion]
 
 Colossus = Coloso
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = "¡Claro, hombre! Él se pasea por el mundo, que le parece estrecho, como un coloso, y nosotros, míseros mortales, tenemos que caminar bajo sus piernas enormes y atisbar por todas partes para hallar una tumba ignominiosa." - William Shakespeare: Julio César
@@ -3476,7 +3465,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori 
 Japan = Japón
-for [mapUnitFilter]] units = para unidades [mapUnitFilter]]
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Acabo de recibir un reporte de que un gran número de mis tropas ha cruzado tus fronteras.
@@ -5975,7 +5963,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
-Comment [comment] tiles take [] damage] = Comentario: casillas [comment] toman [] daño]
 
 Theodora = Teodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Siempre es una vergüenza destruir una cosa bella. Felizmente, usted no es uno.
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index 3f1e99efd1..ade09cf05a 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -2311,6 +2311,8 @@ Starts with [policy] adopted = Startar med [policy] anammad
 Triggers victory = Leder till seger
 Triggers a Cultural Victory upon completion = Utlöser en kulturell vinst när den färdigställs
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
 "Borrows" city names from other civilizations in the game = "Lånar" stadsnamn från andra civilisationer i spelet
 Cities are razed [amount] times as fast = Städer jämnas med marken [amount] gånger snabbare
@@ -3154,8 +3156,6 @@ Mint = Myntslageri
 Aqueduct = Akvedukt
 
 Heroic Epic = Hjälteepos
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Kolossen
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Ja, över denna trånga världen går han / Som en koloss; vi stackars småfolk vandra / Emellan jättens ben och titta fram / För att utleta oss en neslig grav.' - William Shakespeare, Julius Caesar
@@ -3921,8 +3921,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Japan
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Jag har just nåtts av en rapport att mängder av mina trupper har gått över dina gränser.
@@ -6717,8 +6715,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baikula
 Saldae = Saldai
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Theodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Det är alltid så trist att förstöra något vackert. Lyckligtvis är du inget sådant.
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index 7c19e4a6d2..3665162447 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -2134,6 +2134,8 @@ Starts with [tech] = 以[tech]開始
 Starts with [policy] adopted = 遊戲開始時已推行[policy]政策
 Triggers victory = 觸發勝利
 Triggers a Cultural Victory upon completion = 完成後觸發文化勝利
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = 可能不會併吞城市
 "Borrows" city names from other civilizations in the game = 從其他文明“借用”城市名
 Cities are razed [amount] times as fast = 摧毁城市速度[amount]倍
@@ -2870,8 +2872,6 @@ Mint = 鑄幣廠
 Aqueduct = 引水渠
 
 Heroic Epic = 英雄史詩
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = 太陽神巨像
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = “嘿，老兄，他像一個巨人似的跨越這狹隘的世界；我們這些渺小的凡人一個個在他粗大的兩腿上行走，四處張望著，替自己尋找不光榮的墳墓。”——威廉·莎士比亞：《尤利烏斯·凱薩》
@@ -3636,8 +3636,6 @@ Yamaguchi = 山口
 Ota = 大田
 Tottori = 鳥取
 Japan = 日本
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = 甘地
 I have just received a report that large numbers of my troops have crossed your borders. = 我剛剛接到報告...我的部隊已經來到你的領土“做客”了。
@@ -6145,8 +6143,6 @@ Sabratha = 薩布拉塔
 Rusadir = 魯薩迪爾
 Baecula = 巴庫拉
 Saldae = 薩爾達
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = 狄奧多拉
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = 毀掉一件美麗的東西總是可惜的。幸好，你不是。
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index 25ba64f57e..1161e1e14c 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -2153,6 +2153,8 @@ Starts with [tech] = [tech] ile başlar
 Starts with [policy] adopted = 
 Triggers victory = Kazanmayı tetikler
 Triggers a Cultural Victory upon completion = Tamamlanması durumunda Külturel Zaferi tetikler
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Şehirleri ilhak edemeyebilir
 "Borrows" city names from other civilizations in the game = Oyundaki uygarlıklardan şehir isimlerini "Ödünç" alır
 Cities are razed [amount] times as fast = Şehirler [amount] kat daha hızlı yıkılır
@@ -3099,8 +3101,6 @@ Mint = Darphane
 Aqueduct = Su Kemeri
 
 Heroic Epic = Kahramanlık Destanı
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Dev Heykel
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Neden adamım, dar dünyayı bir dev gibi en iyi şekilde değerlendiriyor ve küçük adamlar büyük bacaklarının altında yürüyoruz ve kendimize onur kırıcı mezarlar bulmak için gözetliyoruz.' - William Shakespeare, Julius Caesar
@@ -3873,8 +3873,6 @@ Yamaguchi = Yamaguçi
 Ota = Ota
 Tottori = Tottori
 Japan = Japonya
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gandi
 I have just received a report that large numbers of my troops have crossed your borders. = Kendi askerlerimin büyük bir bölümünün senin sınırların içine girdiğinin raporunu aldım.
@@ -6737,8 +6735,6 @@ Rusadir =
 Baecula = 
  # Requires translation!
 Saldae = 
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Theodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Bir güzelliği yok etmek her zaman utanç vericidir. Neyse ki sen güzel birisi değilsin.
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index eb266bcd82..c91b064aa9 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -2067,6 +2067,8 @@ Starts with [tech] = Розпочинає гру з  технологією [tec
 Starts with [policy] adopted = Починається, коли прийнято [policy]
 Triggers victory = Визначає перемогу
 Triggers a Cultural Victory upon completion = Культурна перемога по закінченню будівництва
+ # Requires translation!
+May buy items in puppet cities = 
 May not annex cities = Не може анексувати міста
 "Borrows" city names from other civilizations in the game = "Запозичує" імена для міст з інших цивілізацій у грі
 Cities are razed [amount] times as fast = Міста знищуються у [amount] рази швидше
@@ -2754,8 +2756,6 @@ Mint = Монетний двір
 Aqueduct = Акведук
 
 Heroic Epic = Героїчний епос
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Колос Родоський
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = "Так, мій друже. Він мов Колос, піднявсь над бідним світом. А ми, маленькі, ходимо під тяжкими його ногами й виглядаєм місця, де б у ганебній опочіть могилі" — Вільям Шекспір, Юлій Цезар.
@@ -3520,8 +3520,6 @@ Yamaguchi = Ямаґучі
 Ota = Ота
 Tottori = Тотторі
 Japan = Японія
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Ганді
 I have just received a report that large numbers of my troops have crossed your borders. = Я тільки-но дізнався, що велика кількість моїх воїнів перейшла через ваші кордони.
@@ -6029,8 +6027,6 @@ Sabratha = Сабрата
 Rusadir = Русадір
 Baecula = Бекула
 Saldae = Салде
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Теодора
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Так прикро нищити красиві речі. На щастя, ти не з таких.
diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties
index fb27d98773..21db8e4d0a 100644
--- a/android/assets/jsons/translations/Vietnamese.properties
+++ b/android/assets/jsons/translations/Vietnamese.properties
@@ -2304,6 +2304,8 @@ Starts with [policy] adopted = Bắt đầu với [policy] được thông qua
 Triggers victory = Kích hoạt chiến thắng
 Triggers a Cultural Victory upon completion = Kích hoạt Chiến thắng Văn hóa sau khi hoàn thành
  # Requires translation!
+May buy items in puppet cities = 
+ # Requires translation!
 May not annex cities = 
 "Borrows" city names from other civilizations in the game = "Vay mượn" tên thành phố từ các nền văn minh khác trong trò chơi 
 Cities are razed [amount] times as fast = Các thành phố được xếp hạng nhanh hơn [amount] lần
@@ -3134,8 +3136,6 @@ Mint = Bạc hà
 Aqueduct = Cầu cạn
 
 Heroic Epic = Sử thi anh hùng
- # Requires translation!
-All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = 
 
 Colossus = Colossus
 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Tại sao anh bạn, anh ta vượt qua thế giới chật hẹp như một pho tượng khổng lồ, và chúng tôi những người đàn ông nhỏ bé đi dưới đôi chân to lớn của anh ta, và nhìn trộm sắp tìm thấy cho mình những nấm mồ đáng khinh.' - William Shakespeare, Julius Caesar
@@ -3901,8 +3901,6 @@ Yamaguchi = Yamaguchi
 Ota = Ota
 Tottori = Tottori
 Japan = Nhật Bản
- # Requires translation!
-for [mapUnitFilter]] units = 
 
 Gandhi = Gandhi
 I have just received a report that large numbers of my troops have crossed your borders. = Tôi vừa nhận được một báo cáo rằng một số lượng lớn quân đội của tôi đã vượt qua biên giới của bạn.
@@ -6411,8 +6409,6 @@ Sabratha = Sabratha
 Rusadir = Rusadir
 Baecula = Baecula
 Saldae = Saldae
- # Requires translation!
-Comment [comment] tiles take [] damage] = 
 
 Theodora = Theodora
 It is always a shame to destroy a thing of beauty. Happily, you are not one. = Luôn luôn là một điều xấu hổ khi phá hủy một thứ đẹp đẽ. Thật hạnh phúc, bạn không phải là một.
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index 1dc343d81f..cf8e3c9723 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -29,7 +29,7 @@ Russian = 99
 Rusyn = 66
 Simplified_Chinese = 99
 Spanish = 99
-Swedish = 83
+Swedish = 84
 Traditional_Chinese = 96
 Turkish = 81
 Ukrainian = 98
diff --git a/changelog.md b/changelog.md
index 012250310b..0a4ccb119a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,24 +1,10 @@
 ## 4.9.18
 
-Performance improvement for canPassThrough
+Performance improvements for movement and ruleset validation
 
-Final performance improvements for the new algotihm, before we say 'goodnight sweet prince' - it underperforms drastically compared to current
+Added unique MayBuyConstructionsInPuppets  - By rpolitex
 
-4.9.17-patch2
-
-4.9.17-patch1
-
-Fix 'move to tile' for new movement 
-
-Added unique MayBuyConstructionsInPupets  - By rpolitex
-
-By SomeTroglodyte:
-- Linting of GameStarter.addCivTechs 
-- Prevent TranslationFileWriter from writing entries crippled by wrong nested brackets interpretation - when UniqueTyped 
-- Unit test against unmatched placeholders in a translation 
-- Fix the german line blocking  
-
-Reorder AddTechnology  - By SeventhM
+Polynesia can immediately embark on turn zero - By SeventhM
 
 Fix NullPointerException on founding a pantheon  - By dHannasch
 
diff --git a/fastlane/metadata/android/en-US/changelogs/956.txt b/fastlane/metadata/android/en-US/changelogs/956.txt
index addfb3ff9f..20ebadc725 100644
--- a/fastlane/metadata/android/en-US/changelogs/956.txt
+++ b/fastlane/metadata/android/en-US/changelogs/956.txt
@@ -1,24 +1,8 @@
+Performance improvements for movement and ruleset validation
 
+Added unique MayBuyConstructionsInPuppets  - By rpolitex
 
-Performance improvement for canPassThrough
-
-Final performance improvements for the new algotihm, before we say 'goodnight sweet prince' - it underperforms drastically compared to current
-
-4.9.17-patch2
-
-4.9.17-patch1
-
-Fix 'move to tile' for new movement 
-
-Added unique MayBuyConstructionsInPupets  - By rpolitex
-
-By SomeTroglodyte:
-- Linting of GameStarter.addCivTechs 
-- Prevent TranslationFileWriter from writing entries crippled by wrong nested brackets interpretation - when UniqueTyped 
-- Unit test against unmatched placeholders in a translation 
-- Fix the german line blocking  
-
-Reorder AddTechnology  - By SeventhM
+Polynesia can immediately embark on turn zero - By SeventhM
 
 Fix NullPointerException on founding a pantheon  - By dHannasch