diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties
index dbac768804..1541a54a0c 100644
--- a/android/assets/jsons/translations/Afrikaans.properties
+++ b/android/assets/jsons/translations/Afrikaans.properties
@@ -268,6 +268,8 @@ Sum: = Totaal:
 
 Trade = Dryf handel
 Offer trade = Bied handel aan
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Trek aanbod terug
 What do you have in mind? = Wat het jy in gedagte?
 Our items = Ons items
@@ -1061,6 +1063,8 @@ Automated units move on turn start =
  # Requires translation!
 Automated units can upgrade = 
  # Requires translation!
+Automated units choose promotions = 
+ # Requires translation!
 Order trade offers by amount = 
  # Requires translation!
 Ask for confirmation when pressing next turn = 
@@ -1605,6 +1609,8 @@ Move unit =
  # Requires translation!
 Stop movement = 
  # Requires translation!
+Show unit destination = 
+ # Requires translation!
 Swap units = 
  # Requires translation!
 Construct improvement = 
@@ -3748,8 +3754,6 @@ when below [amount] [resource] =
  # Requires translation!
 in this city = 
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties
index 6780706333..e7574df776 100644
--- a/android/assets/jsons/translations/Belarusian.properties
+++ b/android/assets/jsons/translations/Belarusian.properties
@@ -348,6 +348,8 @@ Trade =
  # Requires translation!
 Offer trade = 
  # Requires translation!
+They'll decide on their turn = 
+ # Requires translation!
 Retract offer = 
  # Requires translation!
 What do you have in mind? = 
@@ -1287,6 +1289,8 @@ Automated units move on turn start =
  # Requires translation!
 Automated units can upgrade = 
  # Requires translation!
+Automated units choose promotions = 
+ # Requires translation!
 Order trade offers by amount = 
  # Requires translation!
 Ask for confirmation when pressing next turn = 
@@ -1831,6 +1835,8 @@ Move unit =
  # Requires translation!
 Stop movement = 
  # Requires translation!
+Show unit destination = 
+ # Requires translation!
 Swap units = 
  # Requires translation!
 Construct improvement = 
@@ -3974,8 +3980,6 @@ when below [amount] [resource] =
  # Requires translation!
 in this city = 
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index 9dbd0ad670..3bb82236e8 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -265,6 +265,8 @@ Sum: = Soma
 
 Trade = Comércio
 Offer trade = Oferecer troca comercial
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Retrair oferta
 What do you have in mind? = O que tens em mente?
 Our items = Nossos itens/recursos
@@ -770,6 +772,8 @@ Auto-build roads = Construir automaticamente estradas
 Automated workers replace improvements = Trabalhadores atribuídos substituem melhorias
 Automated units move on turn start = Unidades automatizadas se movem no início do turno
 Automated units can upgrade = Unidades automatizadas podem ser atualizadas
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Ordenar ofertas de comércio por quantidade
 Ask for confirmation when pressing next turn = Pedir confirmação ao pressionar o botão de próximo turno
 Notifications log max turns = Registro de notificações máximo de turnos
@@ -1065,6 +1069,8 @@ Range = Alcance
 XP = XP
 Move unit = Mover a unidade
 Stop movement = Parar o movimento
+ # Requires translation!
+Show unit destination = 
 Swap units = Trocar unidades
 Construct improvement = Construir melhoria
 Automate = Automatizar
@@ -2195,7 +2201,6 @@ without [resource] = sem [resource]
 when above [amount] [resource] = quando acima de [amount] de [resource]
 when below [amount] [resource] = quando abaixo de [amount] de [resource]
 in this city = nesta cidade
-in other cities = em outras cidades
 in cities with a [buildingFilter] = em cidades com um [buildingFilter]
 in cities without a [buildingFilter] = em cidades sem um [buildingFilter]
 in cities with at least [amount] [populationFilter] = em cidades com pelo menos [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index 28ad205374..a83aeaea22 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -291,6 +291,8 @@ Sum: = Общо:
 
 Trade = Сделка
 Offer trade = Предложете сделка
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Оттеглете сделка
 What do you have in mind? = Какво имате в предвид?
 Our items = Нашите елементи
@@ -925,6 +927,8 @@ Automated workers replace improvements = Автоматизирани работ
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Подредба на офертите за търговия по стойност
 Ask for confirmation when pressing next turn = Потвърждение при натискане на следващ ход
  # Requires translation!
@@ -1335,6 +1339,8 @@ Range = Разстояние
 XP = Опит
 Move unit = Преместване на единица
 Stop movement = Спиране на движение
+ # Requires translation!
+Show unit destination = 
 Swap units = Размени единици
 Construct improvement = Построяване на подобрение
 Automate = Автоматизиране
@@ -3116,8 +3122,6 @@ when above [amount] [resource] =
 when below [amount] [resource] = 
 in this city = в този град
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties
index 17ea3d3319..1fda97976f 100644
--- a/android/assets/jsons/translations/Catalan.properties
+++ b/android/assets/jsons/translations/Catalan.properties
@@ -1067,6 +1067,8 @@ Range = Abast
 XP = PExp
 Move unit = Moure la unitat
 Stop movement = Para de moure
+ # Requires translation!
+Show unit destination = 
 Swap units = Intercanvia les unitats
 Construct improvement = Construeix una millora
 Automate = Automatitza
@@ -2197,7 +2199,6 @@ without [resource] = sense [resource]
 when above [amount] [resource] = quan s’estigui per damunt de [amount] [resource]
 when below [amount] [resource] = quan s’estigui per sota de [amount] [resource]
 in this city = en aquesta ciutat
-in other cities = en les altres ciutats
 in cities with a [buildingFilter] = en ciutats amb un [buildingFilter]
 in cities without a [buildingFilter] = en ciutats sense [buildingFilter]
 in cities with at least [amount] [populationFilter] = en ciutats amb almenys [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 24d747d5c3..f38823ddfc 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -265,6 +265,8 @@ Sum: = Součet:
 
 Trade = Obchodovat
 Offer trade = Nabídnout
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Zrušit nabídku
 What do you have in mind? = Co máte na mysli?
 Our items = Naše obchodní artikly
@@ -774,6 +776,8 @@ Automated workers replace improvements = Automatizovaní dělníci předělávaj
 Automated units move on turn start = Automatizované jednotky se hýbou na začátku kola
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Řadit obchodní nabídky dle množství
 Ask for confirmation when pressing next turn = Žádat o potvrzení po stisku dalšího kola
 Notifications log max turns = Maximální počet tahů pro záznam oznámení
@@ -1075,6 +1079,8 @@ Range = Vzdálenost
 XP = Zkušenosti
 Move unit = Pohnout jednotkou
 Stop movement = Zastavit pohyb
+ # Requires translation!
+Show unit destination = 
 Swap units = Vyměnit jednotky
 Construct improvement = Vybudovat vylepšení
 Automate = Automatizovat
@@ -2493,8 +2499,6 @@ when above [amount] [resource] =
 when below [amount] [resource] = 
 in this city = v tomto městě
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index d5c8dc5670..6ebb523085 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -265,6 +265,8 @@ Sum: = Som:
 
 Trade = Handel
 Offer trade = Aanbod aanbieden
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Aanbod intrekken
 What do you have in mind? = Wat heb je in gedachten?
 Our items = Onze goederen
@@ -770,6 +772,8 @@ Auto-build roads = Bouw wegen automatisch
 Automated workers replace improvements = Laat werkers automatisch verbeteringen vervangen
 Automated units move on turn start = Eenheden bewegen automatisch bij het begin van een beurt
 Automated units can upgrade = Geautomatiseerde eenheden kunnen zich opwaarderen
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Sorteer handelsaanbiedingen naar hoeveelheid
 Ask for confirmation when pressing next turn = Vraag voor bevestiging bij de knop "Volgende beurt"
 Notifications log max turns = Aantal beurten op meldingenlijst
@@ -1065,6 +1069,8 @@ Range = Bereik
 XP = Ervaring
 Move unit = Eenheid verplaatsen
 Stop movement = Verplaatsen stoppen
+ # Requires translation!
+Show unit destination = 
 Swap units = Verwissel eenheden
 Construct improvement = Verbetering bouwen
 Automate = Automatiseren
@@ -2195,7 +2201,6 @@ without [resource] = zonder [resource]
 when above [amount] [resource] = boven [amount] [resource]
 when below [amount] [resource] = onder [amount] [resource]
 in this city = in deze stad
-in other cities = in andere steden
 in cities with a [buildingFilter] = in steden met een [buildingFilter]
 in cities without a [buildingFilter] = in steden zonder een [buildingFilter]
 in cities with at least [amount] [populationFilter] = in steden met minstens [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index 04d8a5e6ab..ab36d829f6 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -471,6 +471,8 @@ Trade =
  # Requires translation!
 Offer trade = 
  # Requires translation!
+They'll decide on their turn = 
+ # Requires translation!
 Retract offer = 
  # Requires translation!
 What do you have in mind? = 
@@ -1409,6 +1411,8 @@ Automated units move on turn start =
  # Requires translation!
 Automated units can upgrade = 
  # Requires translation!
+Automated units choose promotions = 
+ # Requires translation!
 Order trade offers by amount = 
  # Requires translation!
 Ask for confirmation when pressing next turn = 
@@ -1953,6 +1957,8 @@ Move unit =
  # Requires translation!
 Stop movement = 
  # Requires translation!
+Show unit destination = 
+ # Requires translation!
 Swap units = 
  # Requires translation!
 Construct improvement = 
@@ -4097,8 +4103,6 @@ when below [amount] [resource] =
  # Requires translation!
 in this city = 
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index c323f8bd1e..0fad91e708 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -269,6 +269,8 @@ Sum: = Kabuuan:
 
 Trade = Kalakalan
 Offer trade = Mag-alok ng kalakalan
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Bawiin ang alok
 What do you have in mind? = Ano ang balak mo?
 Our items = Ang ating mga aytem
@@ -814,6 +816,8 @@ Automated workers replace improvements = Kusang gagawin ng mga manggagawa ang mg
 Automated units move on turn start = Kusang paggalaw ng mga yunit sa simula ng turno 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Magbigay ng alok ayon sa dami
 Ask for confirmation when pressing next turn = Humingi ng kumpirmasyon kapag pipindot ng susunod na turno
 Notifications log max turns = Sukdulan ng mga turno sa mga abiso
@@ -1119,6 +1123,8 @@ Range = Saklaw
 XP = XP
 Move unit = Galawin ang yunit
 Stop movement = Itigil ang paggalaw
+ # Requires translation!
+Show unit destination = 
 Swap units = Magpalit ng yunit
 Construct improvement = Gumawa ng Pagbubuti
 Automate = I-awtomeyt
@@ -2302,8 +2308,6 @@ without [resource] = kapag wala ang [resource]
 when above [amount] [resource] = kapag nasa itaas ng [amount] [resource]
 when below [amount] [resource] = kapag nasa ibaba ng [amount] [resource]
 in this city = sa lungsod
- # Requires translation!
-in other cities = 
 in cities with a [buildingFilter] = sa mga lungsod na may isang [buildingFilter]
 in cities without a [buildingFilter] = sa mga lungsod na walang [buildingFilter]
 in cities with at least [amount] [populationFilter] = sa mga lungsod na hindi bababa ng [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index e848acd3ed..de180dadb6 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -307,6 +307,8 @@ Sum: = Summa
 
 Trade = Vaihtokauppa
 Offer trade = Ehdota vaihtokauppaa
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Peruuta tarjous
 What do you have in mind? = Mitä sinulla on mielessäsi?
 Our items = Mahdolliset tarjottavat
@@ -1059,6 +1061,8 @@ Automated workers replace improvements = Automatusoidut työmiehet korvaavat par
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Listaa kauppatarjoukset määrän mukaan
  # Requires translation!
 Ask for confirmation when pressing next turn = 
@@ -1476,6 +1480,8 @@ Range = Kantomatka
 XP = 
 Move unit = Liikuta
 Stop movement = Lopeta liikkuminen
+ # Requires translation!
+Show unit destination = 
 Swap units = Vaihda yksiköiden paikkoja
 Construct improvement = Rakenna parannus
 Automate = Automatisoi
@@ -3260,8 +3266,6 @@ when above [amount] [resource] =
 when below [amount] [resource] = 
 in this city = tässä kaupungissa
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 560a507ee2..0192b52413 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -265,6 +265,8 @@ Sum: = Somme :
 
 Trade = Échanges
 Offer trade = Proposer un échange
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Retirer l'offre
 What do you have in mind? = À quoi pensez-vous ?
 Our items = Nos biens
@@ -770,6 +772,8 @@ Auto-build roads = Construction automatique des routes
 Automated workers replace improvements = Les ouvriers automatisés remplacent les aménagements
 Automated units move on turn start = Les unités automatisées se déplacent au début du tour
 Automated units can upgrade = Les unités automatisées peuvent s'améliorer elles-mêmes
+ # Requires translation!
+Automated units choose 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
 Notifications log max turns = Tours max. dans le journal de notifications
@@ -1065,6 +1069,8 @@ Range = Portée
 XP = XP
 Move unit = Déplacer l'unité
 Stop movement = Stopper le déplacement
+ # Requires translation!
+Show unit destination = 
 Swap units = Permuter les unités
 Construct improvement = Bâtir un aménagement
 Automate = Automatiser
@@ -2195,7 +2201,6 @@ without [resource] = sans [resource]
 when above [amount] [resource] = quand à plus de [amount] [resource]
 when below [amount] [resource] = quand à moins de [amount] [resource]
 in this city = dans cette ville
-in other cities = dans les autres villes
 in cities with a [buildingFilter] = dans les villes avec [buildingFilter]
 in cities without a [buildingFilter] = dans les villes sans [buildingFilter]
 in cities with at least [amount] [populationFilter] = dans les villes avec au moins [amount] en [populationFilter]
@@ -2281,13 +2286,9 @@ upon being promoted = en étant promu(e)
 upon losing at least [amount] HP in a single attack = en perdant au moins [amount] PV en une seule attaque
 upon ending a turn in a [tileFilter] tile = en terminant un tour sur une case [tileFilter]
 Hidden after generating a Great Prophet = Caché après avoir généré un Grand Prophète
- # Requires translation!
 Mod is incompatible with [modFilter] = Le mod est incompatible avec [modFilter]
- # Requires translation!
 Should only be used as permanent audiovisual mod = Devrait être activé uniquement comme mod audiovisuel permanent
- # Requires translation!
 Can be used as permanent audiovisual mod = Peut être activé comme mod audiovisuel permanent
- # Requires translation!
 Cannot be used as permanent audiovisual mod = Ne peut pas être activé comme mod audiovisuel permanent
 
 ######### Map Unit Filters ###########
@@ -6373,7 +6374,6 @@ The amount of ⍾Science you receive at the end is dependent on the ⍾Science g
 Defensive Pacts = Pactes de défense
 Defensive pacts allow you and another civ to protect one another from aggressors.\nOnce the defensive pact is signed, you will be drawn into their future defensive wars, just as they will be drawn into your future defensive wars. Declaring war on any Civ will remove all of your defensive pacts. You will have to re-sign them to use their effect. = Les pactes de défense permettent à deux civilisations de se protéger mutuellement contre tout agresseur.\nUne fois le pacte de défense signé avec une autre civilisation, vous serez impliqué dans toutes les guerres défensives de cette civilisation, tout comme cette dernière sera impliquée dans toutes vos guerres défensives. Déclarer la guerre à une civilisation rendra caduques tous vos pactes de défense. Vous devrez les signer de nouveau pour bénéficier de leur effet. 
 Be cautious when signing defensive pacts because they can bring you into wars that you might not want to be in. = Soyez prudent lors de la signature de pactes de défense, car cela peut vous entraîner dans des guerres que vous ne pouvez ou ne voulez pas mener.
- # Requires translation!
 The AI is very careful and will not accept defensive pacts with less than 80 influence. = L'IA sera très méfiante et n'acceptera aucun pacte de défense avec moins de 80 en relation.
 
 Not all nations are contending with you for victory.\nCity-States are nations that can't win, can't be traded with, and instead confer certain bonuses to friendly civilizations. = Toutes les nations ne sont pas en compétition pour la victoire finale.\nLes Cités-États ne peuvent pas gagner, ni effectuer d'échanges, mais offrent divers bonus aux civilisations amies ou alliées.
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 5e49a5bfb1..69e902d682 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -265,6 +265,8 @@ Sum: = Summe:
 
 Trade = Handel
 Offer trade = Handel anbieten
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Angebot zurückziehen
 What do you have in mind? = Was schwebt Euch vor?
 Our items = Unsere Gegenstände
@@ -770,6 +772,8 @@ Auto-build roads = Automatischer Straßenbau
 Automated workers replace improvements = Automatisierte Arbeiter ersetzen Verbesserungen
 Automated units move on turn start = Automatisierte Einheiten bewegen sich bei Rundenstart
 Automated units can upgrade = Automatisierte Einheiten können aufgerüstet werden
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Handelsangebote nach Menge sortieren
 Ask for confirmation when pressing next turn = Bitte um Bestätigung für 'Nächste Runde'
 Notifications log max turns = Maximale Rundenanzahl des Benachrichtigungsverlaufs
@@ -1065,6 +1069,8 @@ Range = Reichweite
 XP = EP
 Move unit = Einheit bewegen
 Stop movement = Bewegung stoppen
+ # Requires translation!
+Show unit destination = 
 Swap units = Einheiten tauschen
 Construct improvement = Verbesserung bauen
 Automate = Automatisieren
@@ -2195,7 +2201,6 @@ without [resource] = ohne [resource]
 when above [amount] [resource] = bei mehr als [amount] [resource]
 when below [amount] [resource] = bei weniger als [amount] [resource]
 in this city = in dieser Stadt
-in other cities = in anderen Städten
 in cities with a [buildingFilter] = in Städten mit [buildingFilter]
 in cities without a [buildingFilter] = in Städten ohne [buildingFilter]
 in cities with at least [amount] [populationFilter] = in Städten mit mindestens [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties
index 3622c79bb2..291afaa301 100644
--- a/android/assets/jsons/translations/Greek.properties
+++ b/android/assets/jsons/translations/Greek.properties
@@ -381,6 +381,8 @@ Trade =
  # Requires translation!
 Offer trade = 
  # Requires translation!
+They'll decide on their turn = 
+ # Requires translation!
 Retract offer = 
 What do you have in mind? = Τι έχεις στο μυαλό σου;
 Our items =  Τα αγαθά μας
@@ -1200,6 +1202,8 @@ Automated units move on turn start =
  # Requires translation!
 Automated units can upgrade = 
  # Requires translation!
+Automated units choose promotions = 
+ # Requires translation!
 Order trade offers by amount = 
  # Requires translation!
 Ask for confirmation when pressing next turn = 
@@ -1700,6 +1704,8 @@ Range = Φάσμα
 XP = 
 Move unit = Μετακίνησε μονάδα 
 Stop movement = Σταμάτα την κίνηση 
+ # Requires translation!
+Show unit destination = 
 Swap units = Άλλαξε μονάδες
 Construct improvement = Οικοδόμησε βελτίωση  
 Automate = Αυτοματοποίησε
@@ -3710,8 +3716,6 @@ when above [amount] [resource] =
 when below [amount] [resource] = 
 in this city = Σε αυτήν την πόλη
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 1e387bec57..e588b1efd4 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -265,6 +265,8 @@ Sum: = Összesen
 
 Trade = Kereskedelem
 Offer trade = Ajánlattétel
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Ajánlat visszavonása
 What do you have in mind? = Mi jár a fejedben?
 Our items = Tételeink
@@ -774,6 +776,8 @@ Automated workers replace improvements = Az önállósított munkások átépít
 Automated units move on turn start = Az önállósított egységek a kör elején mozogjanak
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Kereskedelmi ajánlatok mennyiség szerinti rendezése
 Ask for confirmation when pressing next turn = A következő körre nyomás után megerősítés szükséges
 Notifications log max turns = Az értesítésnapló maximális hossza körökben
@@ -1069,6 +1073,8 @@ Range = Hatótávolság
 XP = TP
 Move unit = Egység mozgatása
 Stop movement = Mozgás befejezése
+ # Requires translation!
+Show unit destination = 
 Swap units = Helycsere
 Construct improvement = Területfejlesztés
 Automate = Önállósítás
@@ -2213,7 +2219,6 @@ without [resource] = [resource] nélkül
 when above [amount] [resource] = [amount] egységnél több [resource] esetén
 when below [amount] [resource] = [amount] egységnél kevesebb [resource] esetén
 in this city = az adott városban
-in other cities = más városokban
 in cities with a [buildingFilter] = [buildingFilter] épülettel rendelkező városokban
 in cities without a [buildingFilter] = [buildingFilter] nélküli városokban
 in cities with at least [amount] [populationFilter] = olyan városokban, ahol [populationFilter] létszáma legalább [amount]
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index e9a62dd848..ba675822a6 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -265,6 +265,8 @@ Sum: = Jumlah:
 
 Trade = Dagang
 Offer trade = Tawarkan perdagangan
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Batalkan tawaran
 What do you have in mind? = Apa yang ada di pikiranmu?
 Our items = Barang kita
@@ -774,6 +776,8 @@ Automated workers replace improvements = Perbolehkan pekerja otomatis mengubah p
 Automated units move on turn start = Unit otomatis bergerak saat giliran dimulai
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Susun penawaran perdagangan berdasarkan jumlah
 Ask for confirmation when pressing next turn = Konfirmasi saat menekan giliran selanjutnya
 Notifications log max turns = Log notifikasi giliran maksimal
@@ -1069,6 +1073,8 @@ Range = Jarak
 XP = XP
 Move unit = Gerakkan unit
 Stop movement = Hentikan pergerakan
+ # Requires translation!
+Show unit destination = 
 Swap units = Tukar unit
 Construct improvement = Bangun peningkatan
 Automate = Otomatisasi
@@ -2205,7 +2211,6 @@ without [resource] = tanpa [resource]
 when above [amount] [resource] = saat di atas [amount] [resource]
 when below [amount] [resource] = saat di bawah [amount] [resource]
 in this city = di kota ini
-in other cities = di kota-kota lain
 in cities with a [buildingFilter] = untuk kota-kota dengan [buildingFilter]
 in cities without a [buildingFilter] = untuk kota-kota tanpa [buildingFilter]
 in cities with at least [amount] [populationFilter] = untuk kota-kota dengan setidaknya [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index 01f3e2954e..c6aab4740b 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -265,6 +265,8 @@ Sum: = Somma:
 
 Trade = Commercio
 Offer trade = Offri scambio
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Ritira offerta
 What do you have in mind? = Cos'hai in mente?
 Our items = I nostri articoli
@@ -770,6 +772,8 @@ Auto-build roads = Costruzione strade automatica
 Automated workers replace improvements = I lavoratori automatizzati rimpiazzano i miglioramenti
 Automated units move on turn start = Le unità automatizzate si muovono a inizio turno
 Automated units can upgrade = Aggiornamento unità automatizzate
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Ordina offerte per quantità
 Ask for confirmation when pressing next turn = Chiedi conferma per fine turno
 Notifications log max turns = Notifiche limite massimo turni
@@ -1065,6 +1069,8 @@ Range = Raggio
 XP = XP
 Move unit = Sposta unità
 Stop movement = Ferma movimento
+ # Requires translation!
+Show unit destination = 
 Swap units = Scambia unità
 Construct improvement = Costruisci miglioramento
 Automate = Automatizza
@@ -2195,7 +2201,6 @@ without [resource] = senza [resource]
 when above [amount] [resource] = oltre [amount] [resource]
 when below [amount] [resource] = a meno di [amount] [resource]
 in this city = in questa città
-in other cities = in altre città
 in cities with a [buildingFilter] = nelle città che possiedono edifici [buildingFilter]
 in cities without a [buildingFilter] = nelle città senza edifici [buildingFilter]
 in cities with at least [amount] [populationFilter] = nelle città con almeno [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index f4598a1eb1..4d0b950cda 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -265,6 +265,8 @@ Sum: = 合計:
 
 Trade = 取引
 Offer trade = 取引を申し込む
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = 取引の申し込みを撤回
 What do you have in mind? = どのような内容で？
 Our items = 我々のアイテム
@@ -799,6 +801,8 @@ Automated workers replace improvements = 自動建設中の労働者によるタ
 Automated units move on turn start = 自動操作ユニットターン開始時に動かす
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = 取引オファーを金額で注文
 Ask for confirmation when pressing next turn = 次のターンを押すときに確認
 Notifications log max turns = 通知ログの最大ターン数
@@ -1110,6 +1114,8 @@ Range = 範囲
 XP = 経験値
 Move unit = ユニットを移動
 Stop movement = 移動をやめる
+ # Requires translation!
+Show unit destination = 
 Swap units = ユニットを入れ代わる
 Construct improvement = タイルの整備
 Automate = 自動建設
@@ -2433,7 +2439,6 @@ when above [amount] [resource] =
  # Requires translation!
 when below [amount] [resource] = 
 in this city = この都市で
-in other cities = 他の都市で
  # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 0609bc21fa..f387ddae5a 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -267,6 +267,8 @@ Sum: = 합계
 
 Trade = 거래
 Offer trade = 거래 제안
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = 거래 취소
 What do you have in mind? = 어떻게 생각하십니까?
 Our items = 우리 물품
@@ -807,6 +809,8 @@ Auto-build roads = 도로 건설 자동
 Automated workers replace improvements =  시설 대체 자동
 Automated units move on turn start = 턴 시작할 때 자동화한 유닛 움직임
 Automated units can upgrade = 자동화된 유닛 업그레이드 가능
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = 거래 품목 갯수순 정렬
 Ask for confirmation when pressing next turn = 턴 넘길 때 확인
 Notifications log max turns = 알림 보관 기간
@@ -1111,6 +1115,8 @@ Range = 사거리
 XP = XP
 Move unit = 이동
 Stop movement = 이동 중지
+ # Requires translation!
+Show unit destination = 
 Swap units = 유닛 교환
 Construct improvement = 시설 건설
 Automate = 자동 건설
@@ -2271,8 +2277,6 @@ without [resource] = [resource]이(가) 없는
 when above [amount] [resource] = [resource] 자원이 [amount]개 이상일 때
 when below [amount] [resource] = [resource] 자원이 [amount]개 이하일 때
 in this city = 이 도시
- # Requires translation!
-in other cities = 
 in cities with a [buildingFilter] = [buildingFilter]이(가) 건설된 도시
 in cities without a [buildingFilter] = [buildingFilter]이(가) 건설되지 않은 도시
 in cities with at least [amount] [populationFilter] = [amount] [populationFilter] 이상의 도시에서
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index b0a689a6af..5099bdad25 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -268,6 +268,8 @@ Sum: = Suma:
 
 Trade = Prekyba
 Offer trade = Siūlyti prekes
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Atmest siūlymą
 What do you have in mind? = Ką turite omenyje?
 Our items = Mūsų prekės
@@ -859,6 +861,8 @@ Automated workers replace improvements = Auto-darbininkai keičia patobulinimus
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Rūšiuoti prek. siūlymus pagal kiekį
 Ask for confirmation when pressing next turn = Perklausti paspaudus 'Pirmyn'
 Notifications log max turns = Pranešimų log ėjimų skaičius
@@ -1197,6 +1201,8 @@ Range = Spindulys
 XP = ★
 Move unit = Perkelti dalinį
 Stop movement = Atšaukti veiksmą
+ # Requires translation!
+Show unit destination = 
 Swap units = Apkeisti vietomis
 Construct improvement = Satyti patobulinimą
 Automate = Automatika
@@ -2433,8 +2439,6 @@ when above [amount] [resource] =
  # Requires translation!
 when below [amount] [resource] = 
 in this city = šiame mieste
- # Requires translation!
-in other cities = 
 in cities with a [buildingFilter] = miestuose turinčiuose: [buildingFilter]
 in cities without a [buildingFilter] = miestuose be: [buildingFilter]
 in cities with at least [amount] [populationFilter] = miestuose turinčiuose bent [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index c943e2a6a3..52ebf522e9 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -345,6 +345,8 @@ Sum: =
 
 Trade = Perdagangan
 Offer trade = Tawar perdagangan
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Tarik balik tawaran
 What do you have in mind? = Apa yang ada dalam fikiran anda?
 Our items = Barang kami
@@ -1090,6 +1092,8 @@ Automated workers replace improvements = Pekerja automatik gantikan peningkatan
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Pesan tawaran perdagangan mengikut jumlah
  # Requires translation!
 Ask for confirmation when pressing next turn = 
@@ -1504,6 +1508,8 @@ Range = Jarak
 XP = 
 Move unit = Gerakkan unit
 Stop movement = Berhenti
+ # Requires translation!
+Show unit destination = 
 Swap units = Tukarkan unit
 Construct improvement = Bina peningkatan
 Automate = Automatikkan
@@ -3270,8 +3276,6 @@ when above [amount] [resource] =
 when below [amount] [resource] = 
 in this city = di bandar ini
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index 64859e5bae..cfd853ec05 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -377,6 +377,8 @@ Sum: =
 
 Trade = Tejārat
 Offer trade = Pišnahād tejārat
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Pas gereftan e pišnahād
 What do you have in mind? = če čizi dar nazar dārid?
 Our items = Āytem hāye mā
@@ -1165,6 +1167,8 @@ Automated workers replace improvements =
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Morattab kardan e pišnahād hāye tejāri az meğdārešoon
  # Requires translation!
 Ask for confirmation when pressing next turn = 
@@ -1611,6 +1615,8 @@ XP =
 Move unit = Harekat dādan e niroo
 Stop movement = Tavağğof e harekat
  # Requires translation!
+Show unit destination = 
+ # Requires translation!
 Swap units = 
 Construct improvement = Behbood baḵšidan
 Automate = Kār e ḵodkār
@@ -3490,8 +3496,6 @@ when below [amount] [resource] =
  # Requires translation!
 in this city = 
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index 239e8ffc19..b382542d87 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -289,6 +289,8 @@ Sum: = Majmoo’
 
 Trade = Tejaarat
 Offer trade = Pishnahaad tejaarat
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Pas gereftan e pishnahaad
 What do you have in mind? = che chizi dar nazar daarid?
 Our items = Aaytem haaye maa
@@ -954,6 +956,8 @@ Automated workers replace improvements = Kaargaraan be soorat e khodkar behbood-
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Morattab kardan e pishnahaad haaye tejaari az meghdaareshoon
  # Requires translation!
 Ask for confirmation when pressing next turn = 
@@ -1313,6 +1317,8 @@ XP = XP
 Move unit = Harekat daadan e niroo
 Stop movement = Tavaghghof e harekat
  # Requires translation!
+Show unit destination = 
+ # Requires translation!
 Swap units = 
 Construct improvement = Behbood bakhshidan
 Automate = Kaar e khodkaar
@@ -3060,8 +3066,6 @@ when below [amount] [resource] =
  # Requires translation!
 in this city = 
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index 45762a1a92..312a881cc9 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -265,6 +265,8 @@ Sum: = Razem:
 
 Trade = Handel
 Offer trade = Złóż ofertę
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Wycofaj ofertę
 What do you have in mind? = Co masz na myśli?
 Our items = Nasze zasoby
@@ -770,6 +772,8 @@ Auto-build roads = Automatycznie buduj drogi
 Automated workers replace improvements = Zautomatyzowani robotnicy zastępują ulepszenia
 Automated units move on turn start = Zautomatyzowane jednostki poruszają się na początku tury
 Automated units can upgrade = Zautomatyzowane jednostki mogą awansować
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Sortuj oferty handlowe według kwoty
 Ask for confirmation when pressing next turn = Potwierdzaj rozpoczęcie następnej tury
 Notifications log max turns = Maksymalna liczba tur w historii „Powiadomień”
@@ -1065,6 +1069,8 @@ Range = Zasięg ruchu
 XP = PD
 Move unit = Przemieść jednostkę
 Stop movement = Zatrzymaj jednostkę
+ # Requires translation!
+Show unit destination = 
 Swap units = Zamień jednostki
 Construct improvement = Zbuduj ulepszenie
 Automate = Automatyzuj
@@ -2195,7 +2201,6 @@ without [resource] = bez [resource]
 when above [amount] [resource] = gdy posiadasz ponad [amount] [resource]
 when below [amount] [resource] = gdy posiadasz mniej niż [amount] [resource]
 in this city = w tym mieście
-in other cities = w innych miastach
 in cities with a [buildingFilter] = w miastach z [buildingFilter]
 in cities without a [buildingFilter] = w miastach bez → [buildingFilter]
 in cities with at least [amount] [populationFilter] = w miastach, w których [populationFilter] to przynajmniej [amount] osoba/y
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index 3a150ad71c..72fe81d5d4 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -267,6 +267,8 @@ Sum: = Soma:
 
 Trade = Comércio
 Offer trade = Oferecer uma troca comercial
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Retrair oferta
 What do you have in mind? = O que tens em mente?
 Our items = Os nssos itens/recursos
@@ -835,6 +837,8 @@ Automated workers replace improvements = Trabalhadores automatizados substituem
 Automated units move on turn start = Unidades automatizadas movem no início do turno
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Ordenar ofertas de comércio por quantidade
 Ask for confirmation when pressing next turn = Pedir confirmação ao pressionar próximo turno
 Notifications log max turns = Registo de notificações máximo de turnos
@@ -1170,6 +1174,8 @@ Range = Alcance
 XP = Experiência
 Move unit = Mover a unidade
 Stop movement = Parar o movimento
+ # Requires translation!
+Show unit destination = 
 Swap units = Trocar unidades
 Construct improvement = Construir uma melhoria
 Automate = Automatizar
@@ -2544,8 +2550,6 @@ when above [amount] [resource] =
 when below [amount] [resource] = 
 in this city = nesta cidade
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
 in cities without a [buildingFilter] = em cidades sem um [buildingFilter]
  # Requires translation!
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index fe5b041cf8..6867dce3d1 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -270,6 +270,8 @@ Sum: = Sumă
 
 Trade = Comerț
 Offer trade = Ofertă comercială
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Retrage oferta
 What do you have in mind? = La ce te gândești?
 Our items = Articolele noastre
@@ -869,6 +871,8 @@ Automated workers replace improvements = Muncitorii automatizați înlocuiesc î
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Comandați oferte comercial după cantitate
 Ask for confirmation when pressing next turn = Cereți confirmare când apăsați următorul urmatoarea tura
  # Requires translation!
@@ -1239,6 +1243,8 @@ Range = Distanță
 XP = 
 Move unit = Mută unitatea
 Stop movement = Oprește mișcarea
+ # Requires translation!
+Show unit destination = 
 Swap units = Schimbați unitățile
 Construct improvement = Construiește îmbunătățire
 Automate = Automatizează
@@ -2681,8 +2687,6 @@ when above [amount] [resource] =
 when below [amount] [resource] = 
 in this city = in acest oras
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
 in cities without a [buildingFilter] = în orașe fără [buildingFilter]
  # Requires translation!
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index bab78cb3ca..dba8e88c82 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -265,6 +265,8 @@ Sum: = Итог:
 
 Trade = Торговля
 Offer trade = Предложить обмен
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Отозвать предложение
 What do you have in mind? = Что вы об этом думаете?
 Our items = Наши товары
@@ -774,6 +776,8 @@ Automated workers replace improvements = Автоматизированные р
 Automated units move on turn start = Автоматизированные юниты двигаются в начале хода
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Сортировать торговые предложения по количеству
 Ask for confirmation when pressing next turn = Спрашивать подтверждение при нажатии следующего хода
 Notifications log max turns = Макс. ходов в журнале оповещений
@@ -1069,6 +1073,8 @@ Range = Радиус
 XP = ОО
 Move unit = Переместить юнит
 Stop movement = Отменить действие
+ # Requires translation!
+Show unit destination = 
 Swap units = Поменять местами
 Construct improvement = Построить улучшение
 Automate = Автоматизировать
@@ -2205,7 +2211,6 @@ without [resource] = без: [resource]
 when above [amount] [resource] = когда больше [amount] [resource]
 when below [amount] [resource] = когда меньше [amount] [resource]
 in this city = в этом городе
-in other cities = В других городах
 in cities with a [buildingFilter] = в городах, имеющих [buildingFilter]
 in cities without a [buildingFilter] = в городах, не имеющих [buildingFilter]
 in cities with at least [amount] [populationFilter] = в городах, имеющих как минимум [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 527c4511ee..19052fdeaf 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -265,6 +265,8 @@ Sum: = 总和：
 
 Trade = 贸易
 Offer trade = 提供贸易
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = 撤回报价
 What do you have in mind? = 你有什么想法？
 Our items = 我们的贸易项目
@@ -770,6 +772,8 @@ Auto-build roads = 自动建造道（铁）路
 Automated workers replace improvements = 工人自动更换设施
 Automated units move on turn start = 每回合开始时自动移动单位
 Automated units can upgrade = 自动单位可以升级
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = 交易方贸易项目按数量排序
 Ask for confirmation when pressing next turn = 手动确认下一回合
 Notifications log max turns = 最长通知记录回合数
@@ -1065,6 +1069,8 @@ Range = 攻击范围
 XP = 经验值
 Move unit = 移动单位
 Stop movement = 停止移动
+ # Requires translation!
+Show unit destination = 
 Swap units = 交换单位
 Construct improvement = 建造设施
 Automate = 自动工作
@@ -2195,7 +2201,6 @@ without [resource] = 未拥有[resource]的
 when above [amount] [resource] = 当[resource]超过[amount]时
 when below [amount] [resource] = 当[resource]低于[amount]时
 in this city = 在这个城市中
-in other cities = 在其他城市中
 in cities with a [buildingFilter] = 在建有[buildingFilter]的城市中
 in cities without a [buildingFilter] = 在未建造[buildingFilter]的城市中
 in cities with at least [amount] [populationFilter] = 在至少有 [amount] [populationFilter] 的城市中
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index 6447377fa4..85dc9ff0c7 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -265,6 +265,8 @@ Sum: = Suma:
 
 Trade = Comercio
 Offer trade = Proponer oferta
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Retirar oferta
 What do you have in mind? = ¿Qué tienes en mente?
 Our items = Nuestros elementos
@@ -770,6 +772,8 @@ Auto-build roads = Construir carreteras autom.
 Automated workers replace improvements = Los Trabajadores aut. Reemplazan Mejoras
 Automated units move on turn start = Unidades Automatizadas se mueven al pricipio del Turno
 Automated units can upgrade = Unidades automatizadas se mejoran solas
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Ordenar ofertas comerciales por cantidad
 Ask for confirmation when pressing next turn = Confirmación al presionar "⏳Siguiente Turno"
 Notifications log max turns = Máximo de guardados de notificaciones por ⏳turno
@@ -1065,6 +1069,8 @@ Range = Alcance
 XP = EXP
 Move unit = Mover unidad
 Stop movement = Parar movimiento
+ # Requires translation!
+Show unit destination = 
 Swap units = Enrocar unidades
 Construct improvement = Construir mejora
 Automate = Automatizar
@@ -2195,7 +2201,6 @@ without [resource] = sin [resource]
 when above [amount] [resource] = al tener más de [amount] [resource]
 when below [amount] [resource] = al tener menos de [amount] [resource]
 in this city = en esta ciudad
-in other cities = en otras ciudades
 in cities with a [buildingFilter] = en ciudades con un/a [buildingFilter]
 in cities without a [buildingFilter] = en ciudades sin un/a [buildingFilter]
 in cities with at least [amount] [populationFilter] = en ciudades con por lo menos [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index 58743fb988..7d90df1114 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -271,6 +271,8 @@ Sum: = Summa:
 
 Trade = Handelsavtal
 Offer trade = Erbjud handelsavtal
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Ta tillbaka erbjudande
 What do you have in mind? = Vad hade du i åtanke?
 Our items = Våra artiklar
@@ -850,6 +852,8 @@ Automated workers replace improvements = Automatiserade arbetare ersätter förb
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Sortera handelserbjudanden efter mängd
 Ask for confirmation when pressing next turn = Be om bekräftelse när nästa drag trycks
 Notifications log max turns = Max drag för notifikationslogg
@@ -1207,6 +1211,8 @@ Range = Räckvidd
 XP = XP
 Move unit = Förflytta enhet
 Stop movement = Avsluta förflyttning
+ # Requires translation!
+Show unit destination = 
 Swap units = Byt plats på enheter
 Construct improvement = Bygg förbättring
 Automate = Automatisera
@@ -2466,8 +2472,6 @@ when above [amount] [resource] =
  # Requires translation!
 when below [amount] [resource] = 
 in this city = i denna stad
- # Requires translation!
-in other cities = 
 in cities with a [buildingFilter] = i städer med en [buildingFilter]
 in cities without a [buildingFilter] = i städer utan [buildingFilter]
 in cities with at least [amount] [populationFilter] = i städer med minst [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index c4721ad1f7..11de55194a 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -265,6 +265,8 @@ Sum: = 總和：
 
 Trade = 貿易
 Offer trade = 提供貿易
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = 撤回報價
 What do you have in mind? = 你有什麼想法？
 Our items = 我們的貿易項目
@@ -780,6 +782,8 @@ Automated workers replace improvements = 工人自動更換設施
 Automated units move on turn start = 回合開始時，移動自動行動單位
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = 交易方貿易項目按數量排序
 Ask for confirmation when pressing next turn = 按下一回合時要求確認
 Notifications log max turns = 最大通知紀錄回合數
@@ -1077,6 +1081,8 @@ Range = 攻擊範圍
 XP = 經驗值 
 Move unit = 移動單位
 Stop movement = 停止移動
+ # Requires translation!
+Show unit destination = 
 Swap units = 交換單位
 Construct improvement = 建造設施
 Automate = 自動工作
@@ -2237,7 +2243,6 @@ without [resource] = 未擁有[resource]
 when above [amount] [resource] = 當[resource]高於[amount]時
 when below [amount] [resource] = 當[resource]低於[amount]時
 in this city = 在所在城市
-in other cities = 在其他城市中
 in cities with a [buildingFilter] = 在具有[buildingFilter]的城市中
 in cities without a [buildingFilter] = 在沒有[buildingFilter]的城市中
 in cities with at least [amount] [populationFilter] = 在該城市至少[amount][populationFilter]
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index e8a6db45a0..1afad2bfd5 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -276,6 +276,8 @@ Sum: = Toplam:
 
 Trade = Ticaret
 Offer trade = Ticaret teklif et
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Teklifi geri çek 
 What do you have in mind? = Aklında ne var?
 Our items = Elimizdekiler
@@ -879,6 +881,8 @@ Automated workers replace improvements = Otomatik moddaki işciler geliştirmele
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Kaynakları ticaret penceresinde sayıya göre büyükten küçüğe sırala
 Ask for confirmation when pressing next turn = Sonraki tura basınca onaylama sor
  # Requires translation!
@@ -1260,6 +1264,8 @@ Range = Menzil
 XP = 
 Move unit = Birliği taşı
 Stop movement = Hareketi durdur
+ # Requires translation!
+Show unit destination = 
 Swap units = Yer Değiş
 Construct improvement = İyileştirme inşa et
 Automate = Otomatikleştir
@@ -2800,8 +2806,6 @@ when above [amount] [resource] =
 when below [amount] [resource] = 
 in this city = bu şehirde
  # Requires translation!
-in other cities = 
- # Requires translation!
 in cities with a [buildingFilter] = 
  # Requires translation!
 in cities without a [buildingFilter] = 
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index 37eec6bd81..77655d1f04 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -265,6 +265,8 @@ Sum: = Всього:
 
 Trade = Торгівля
 Offer trade = Запропонувати угоду
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Відкликати пропозицію
 What do you have in mind? = Що ви маєте на увазі?
 Our items = Наші речі
@@ -775,6 +777,8 @@ Automated workers replace improvements = Автоматизовані праці
 Automated units move on turn start = Автоматичний рух підрозділів на початку ходу
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Сортувати торгові пропозиції за кількістю
 Ask for confirmation when pressing next turn = Питати підтвердження наступного ходу
 Notifications log max turns = Макс. кількість ходів у журналі сповіщень
@@ -1072,6 +1076,8 @@ Range = Дальність
 XP = Досвід
 Move unit = Перемістити підрозділ
 Stop movement = Скасувати переміщення
+ # Requires translation!
+Show unit destination = 
 Swap units = Поміняти місцями
 Construct improvement = Покращити
 Automate = Автоматизувати
@@ -2223,7 +2229,6 @@ without [resource] = без [resource]
 when above [amount] [resource] = коли більше [amount] [resource]
 when below [amount] [resource] = коли менше [amount] [resource]
 in this city = у цьому місті
-in other cities = в інших містах
 in cities with a [buildingFilter] = у містах з [buildingFilter]
 in cities without a [buildingFilter] = у містах без [buildingFilter]
 in cities with at least [amount] [populationFilter] = у містах із принаймні [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties
index 0a017defcd..a1ee66cfc5 100644
--- a/android/assets/jsons/translations/Vietnamese.properties
+++ b/android/assets/jsons/translations/Vietnamese.properties
@@ -268,6 +268,8 @@ Sum: = Tổng
 
 Trade = Giao dịch
 Offer trade = Đề nghị giao dịch
+ # Requires translation!
+They'll decide on their turn = 
 Retract offer = Hủy bỏ giao dịch
 What do you have in mind? = Bạn nghĩ gì trong đầu?
 Our items = Vật phẩm của bạn
@@ -859,6 +861,8 @@ Automated workers replace improvements = Công nhân tự động thay thế c
 Automated units move on turn start = 
  # Requires translation!
 Automated units can upgrade = 
+ # Requires translation!
+Automated units choose promotions = 
 Order trade offers by amount = Yêu cầu giao dịch theo số lượng
 Ask for confirmation when pressing next turn = Yêu cầu xác nhận khi nhấn lượt tiếp theo
 Notifications log max turns = Số lượt tối đa của nhật ký thông báo
@@ -1197,6 +1201,8 @@ Range = Tầm xa
 XP = XP
 Move unit = Di chuyển đơn vị
 Stop movement = Ngừng di chuyển
+ # Requires translation!
+Show unit destination = 
 Swap units = Hoán đổi đơn vị
 Construct improvement = Cải tiến
 Automate = Tự động
@@ -2428,8 +2434,6 @@ when above [amount] [resource] =
  # Requires translation!
 when below [amount] [resource] = 
 in this city = tại thành phố này
- # Requires translation!
-in other cities = 
 in cities with a [buildingFilter] = ở các thành phố có [buildingFilter]
 in cities without a [buildingFilter] = ở các thành phố không có [buildingFilter]
 in cities with at least [amount] [populationFilter] = ở các thành phố có ít nhất [amount] [populationFilter]
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index 0d118adf22..4a8574168d 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -28,6 +28,6 @@ Japanese = 80
 English = 0
 Vietnamese = 92
 Czech = 82
-Hungarian = 79
+Hungarian = 78
 Dutch = 99
 Greek = 15
diff --git a/changelog.md b/changelog.md
index 2b34db5207..f86071bee4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,24 +1,22 @@
 ## 4.7.19
 
-Resolved  - Defensive pact allies *meet* the aggressor civ so they can declare war on them, if they haven't already met
-
-Resolved  - Great person points for units not in ruleset are ignored, and warned against
-
-Performance: No need to calculate stats before reassigning population, since it's done there anyway
-
-Performance - copy resourceCache, and don't reassign population and update civ resources, when checking improvement stat diff
-
-Resolved  - clarify when trade decision is made for new players
-
-Automated units will not autopromote by default (changeable by options setting)
-
 "Jump To Destination" Unit Action Button for units that are moving  - By huckdogg
 
-Refactor BattleDamage object and test it  - By Framonti
+Automated units do not autopromote by default (changeable by options setting)
 
-By SomeTroglodyte:
-- UnitTable close button mouseover 
-- Some wiki documentation for declarative mod compatibility 
+Defensive pact allies meet aggressor civ so they can declare war on them
+
+Modding: GPP validation
+
+Performance:
+- Faster population reassignment
+- Faster improvement stats simulation
+
+Clarify when trade decision is made
+
+Battle Damage tests - By Framonti
+
+UnitTable close button mouseover - By SomeTroglodyte
 
 ## 4.7.18
 
diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md
index efad12c529..03f5521caf 100644
--- a/docs/Modders/uniques.md
+++ b/docs/Modders/uniques.md
@@ -1887,9 +1887,6 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
 ??? example  "<in this city>"
 	Applicable to: Conditional
 
-??? example  "<in other cities>"
-	Applicable to: Conditional
-
 ??? example  "<in cities with a [buildingFilter]>"
 	Example: "<in cities with a [Culture]>"
 
diff --git a/fastlane/metadata/android/en-US/changelogs/907.txt b/fastlane/metadata/android/en-US/changelogs/907.txt
index 8d123eff2a..22fd05f2de 100644
--- a/fastlane/metadata/android/en-US/changelogs/907.txt
+++ b/fastlane/metadata/android/en-US/changelogs/907.txt
@@ -1,21 +1,17 @@
-
-
-Resolved  - Defensive pact allies *meet* the aggressor civ so they can declare war on them, if they haven't already met
-
-Resolved  - Great person points for units not in ruleset are ignored, and warned against
-
-Performance: No need to calculate stats before reassigning population, since it's done there anyway
-
-Performance - copy resourceCache, and don't reassign population and update civ resources, when checking improvement stat diff
-
-Resolved  - clarify when trade decision is made for new players
-
-Automated units will not autopromote by default (changeable by options setting)
-
 "Jump To Destination" Unit Action Button for units that are moving  - By huckdogg
 
-Refactor BattleDamage object and test it  - By Framonti
+Automated units do not autopromote by default (changeable by options setting)
 
-By SomeTroglodyte:
-- UnitTable close button mouseover 
-- Some wiki documentation for declarative mod compatibility 
\ No newline at end of file
+Defensive pact allies meet aggressor civ so they can declare war on them
+
+Modding: GPP validation
+
+Performance:
+- Faster population reassignment
+- Faster improvement stats simulation
+
+Clarify when trade decision is made
+
+Battle Damage tests - By Framonti
+
+UnitTable close button mouseover - By SomeTroglodyte
\ No newline at end of file