diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties
index 04d684b779..6048a72fe3 100644
--- a/android/assets/jsons/translations/Afrikaans.properties
+++ b/android/assets/jsons/translations/Afrikaans.properties
@@ -4227,6 +4227,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties
index 420cb412fe..0434c01f90 100644
--- a/android/assets/jsons/translations/Belarusian.properties
+++ b/android/assets/jsons/translations/Belarusian.properties
@@ -4479,6 +4479,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index f87b60cfea..866cd1a337 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -2472,6 +2472,8 @@ Transform = Transformar
 Repair = Reparar
 Confirm Dialog = Confirmar Diálogo
 Cancel Dialog = Cancelar Diálogo
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index dade223769..f8ce23801c 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -3566,6 +3566,8 @@ Repair = Поправи
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties
index 1364757a48..ca07317dc5 100644
--- a/android/assets/jsons/translations/Catalan.properties
+++ b/android/assets/jsons/translations/Catalan.properties
@@ -2560,6 +2560,8 @@ Transform =
 Repair = Repara
 Confirm Dialog = Confirma el diàleg
 Cancel Dialog = Cancel·la el diàleg
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 5dacaa6223..280d0d3422 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -2905,6 +2905,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index cfa691e858..966b1a29ba 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -540,9 +540,7 @@ The incompatible elements have been removed. = De onverenigbare elementen zijn v
 Current map: World Wrap = 
  # Requires translation!
 Overlay image = 
- # Requires translation!
 Click to choose a file = Klik om een bestand te kiezen
- # Requires translation!
 Choose an image = Kies een afbeelding
  # Requires translation!
 Overlay opacity: = 
@@ -615,9 +613,7 @@ You have to write an ID for your friend! = Je moet een speler-ID voor je vriend
 You cannot add your own player ID in your friend list! = Je kan je eigen speler-ID niet in de vriendenlijst plaatsen!
 To add a friend, ask him to send you his player ID.\nClick the 'Add friend' button.\nInsert his player ID and a name for him.\nThen click the 'Add friend' button again.\n\nAfter that you will see him in your friends list.\n\nA new button will appear when creating a new\nmultiplayer game, which allows you to select your friend. = Als je een vriend wilt toevoegen, vraag eerst de speler-ID aan je vriend.\nDruk op de "Voeg een vriend toe" knop.\nVoeg de speler-ID en een naam in voor je vriend.\nDruk opnieuw op de "Voeg een vriend toe" knop waarna je vriend in de vriendenlijst verschijnt.\n\nWanneer je een nieuw multiplayer game aanmaakt verschijnt er\neen nieuwe knop die je toelaat je vriend te selecteren. 
 Please input Player ID! = Gelieve een Speler-ID te geven!
- # Requires translation!
 The number of players will be adjusted = Het aantal spelers zal aangepast worden
- # Requires translation!
 These [numberOfPlayers] players will be adjusted = Deze [numberOfPlayers] zullen aangepast worden
  # Requires translation!
 [numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = 
@@ -727,7 +723,6 @@ Display = Scherm
 
 ### Screen subgroup
 
- # Requires translation!
 Screen = Scherm
 Screen Mode = Scherm Modus
 Windowed = Venster
@@ -748,18 +743,13 @@ UI Skin = UI weergave
 
 ### UI subgroup
 
- # Requires translation!
 UI = UI
 
  # Requires translation!
 Notifications on world screen = 
- # Requires translation!
 Disabled = Uitgeschakeld
- # Requires translation!
 Hidden = Verborgen
- # Requires translation!
 Visible = Zichtbaar
- # Requires translation!
 Permanent = Permanent
 
 Minimap size = Grootte minimap
@@ -776,13 +766,11 @@ Experimental Demographics scoreboard = Experimenteel Demografisch scorebord
 
 ### Visual Hints subgroup
 
- # Requires translation!
 Visual Hints = Visuele Hints
 Show worked tiles = Toon tegels waarop gewerkt wordt
 Show resources and improvements = Toon grondstoffen en verbeteringen
 Show tile yields = Toon tegelopbrengsten
 Show unit movement arrows = Toon eenheid bewegingspijlen
- # Requires translation!
 Show suggested city locations for units that can found cities = Toon aanbevolen stadslokaties voor eenheden die steden kunnen stichten
 Show pixel units = Toon gepixeleerde eenheden
 Show pixel improvements = Toon gepixeleerde verbeteringen
@@ -825,11 +813,8 @@ Currently playing: [title] = Momenteel speelt: [title]
 Download music = Download muziek
 Downloading... = Downloading ...
 Could not download music! = Kon de muziek niet downloaden!
- # Requires translation!
 —Paused— = —Gepauzeerd—
- # Requires translation!
 —Default— = —Standaard—
- # Requires translation!
 —History— = —Geschiedenis—
 
 ## Advanced tab
@@ -852,7 +837,6 @@ Default Font = Standaard lettertype
 Generate translation files = Genereer vertaalbestanden
 Translation files are generated successfully. = Vertaalbestanden werden succesvol gegenereerd.
 Fastlane files are generated successfully. = Fastlane bestanden zijn succesvol gegenereerd.
- # Requires translation!
 Update Mod categories = Update Mod categorieën
 
 Enable Easter Eggs = Laat Easter Eggs toe
@@ -862,7 +846,6 @@ Enlarge selected notifications =
 ## Keys tab
 Keys = Sneltoetsen
 Please see the Tutorial. = Zie de handleiding.
- # Requires translation!
 Hit the desired key now = Druk nu op de gewenste toets
 
 ## Locate mod errors tab
@@ -1057,9 +1040,7 @@ You may choose a free Policy = Je mag een gratis Beleid kiezen
 You may choose [amount] free Policies = Je mag [amount] gratis Beleiden kiezen
 You gain the [policy] Policy = Je ontvangt het [policy] Beleid
 You enter a Golden Age = Je betreed een Gouden Eeuw
- # Requires translation!
 You have gained [amount] [resourceName] = Je hebt [amount] [resourceName] gekregen
- # Requires translation!
 You have lost [amount] [resourceName] = Je hebt [amount] [resourceName] verloren
 
 ## Trigger causes
@@ -1273,9 +1254,7 @@ Please select a tile for this building's [improvement] = Selecteer een een titel
 Invalid input! Please enter a different string. = Niet geldige invoer. Voer alsjeblief een andere string in.
 Invalid input! Please enter a valid number. = Onjuiste invoer! Voer alsjeblieft een geldig nummer in.
 Please enter some text = Voer tekst in
- # Requires translation!
 Please enter a file name = Gelieve een bestandsnaam in te geven
- # Requires translation!
 File name: = Bestandsnaam
 
 # Technology UI
@@ -1434,7 +1413,6 @@ Allied with [civName] = Geallieerd met [civName]
 Civilization Info = Beschaving informatie
 Relations = Relaties
 Trade request = Handelsverzoek
- # Requires translation!
 Garrisoned by unit = Versterkt door eenheid
 
 # Victory
@@ -1452,14 +1430,11 @@ You have been defeated. Your civilization has been overwhelmed by its many foes.
 One more turn...! = Nog een beurt ...!
 Destroy [civName] = Vernietig [civName]
 Capture [cityName] = Verover [cityName]
- # Requires translation!
 Destroy ? * [civName] = Vernietig ? * [civName]
- # Requires translation!
 Capture ? * [cityName] = Bezet ? * [cityName]
 Our status = Onze status
 Global status = Globale status
 Rankings = Rangschikking
- # Requires translation!
 Charts = Statistieken
 Demographics = Demografie
 Demographic = Demografisch
@@ -1486,7 +1461,6 @@ What would you like to do with the city of [cityName]? = Wat doen we met de stad
 Annex = Annexeren
 Annexed cities become part of your regular empire. = Geannexeerde steden worden onderdeel van je gewone rijk.
 Their citizens generate 2x the unhappiness, unless you build a courthouse. = Hun inwoners genereren 2x zoveel onvrede, tenzij je een gerechtsgebouw bouwt.
- # Requires translation!
 Your civilization may not annex this city. = Je beschaving mag deze stad niet innemen.
 Puppet = Vazal
 Puppeted cities do not increase your tech or policy cost. = Vazalsteden verhogen niet de uitgaven voor wetenschap en beleid.
@@ -1686,7 +1660,6 @@ Minimal Faith required for\nthe next [Great Prophet]: = Minimale geloof vereist
 Religions to be founded: [amount] = Religies nog te stichten: [amount]
 Available religion symbols = Beschikbare religie symbolen
 Number of civilizations * [amount] + [amount2] = Aantal beschavingen * [amount] + [amount2]
- # Requires translation!
 Estimated Number of civilizations * [amount] + [amount2] = Geschat Aantal beschavingingen * [amount] + [amount2]
 Religions already founded = Gestichte religies
 Available founder beliefs = Beschikbare oprichtersovertuigingen
@@ -1929,7 +1902,6 @@ Gifts of Gold to City-States generate [relativeAmount]% more Influence = Giften
 Can spend Gold to annex or puppet a City-State that has been your ally for [amount] turns. = Kan goud uitgeven om een stadstaat die je bondgenoot is geweest voor [amount] beurten te annexeren of tot vazalstad te maken.
 City-State territory always counts as friendly territory = Stadstaat-territorium geldt altijd as bevriend territorium
 Allied City-States will occasionally gift Great People = Geallieerde Stadstaten schenken soms Grote Mensen
- # Requires translation!
 Will not be chosen for new games = Zal niet gekozen worden voor nieuwe spelsessies
 [relativeAmount]% City-State Influence degradation = [relativeAmount]% Stadstaat invloed degredatie 
 Resting point for Influence with City-States is increased by [amount] = Rustpunt van Invloed met Stadstaten is verhoogd met [amount]
@@ -1973,7 +1945,6 @@ May buy [buildingFilter] buildings with [stat] for [amount] times their normal P
 Enables conversion of city production to [civWideStat] = Maakt conversie mogelijk van stadsproductie naar [civWideStat]
 Improves movement speed on roads = Verbeter bewegingssnelheid op wegen
 Roads connect tiles across rivers = Wegen verbinden tegels over rivieren
- # Requires translation!
 [relativeAmount]% maintenance on road & railroads = [relativeAmount]% onderhoud aan wegen en spoorwegen
  # Requires translation!
 No Maintenance costs for improvements in [tileFilter] tiles = 
@@ -2006,7 +1977,6 @@ Units in cities cost no Maintenance = Eenheden in steden kosten geen Onderhoud
 Receive free [unit] when you discover [tech] = Ontvang een gratis [unit] wanneer je [tech] ontdekt
  # Requires translation!
 Enables embarkation for land units = 
- # Requires translation!
 Enables [mapUnitFilter] units to enter ocean tiles = Laat [mapUnitFilter] eenheden toe oceaan tegels te betreden
  # Requires translation!
 Land units may cross [terrainName] tiles after the first [baseUnitFilter] is earned = 
@@ -2017,7 +1987,6 @@ All newly-trained [baseUnitFilter] units [cityFilter] receive the [promotion] pr
 [mapUnitFilter] Units adjacent to this city heal [amount] HP per turn when healing = [mapUnitFilter] Eenheden naast deze stad helen [amount] HP per beurt als ze aan het helen zijn.
 [relativeAmount]% City Strength from defensive buildings = [relativeAmount]% Stadsterkte van defensieve gebouwen
 [relativeAmount]% Strength for cities = [relativeAmount]% Kracht voor steden
- # Requires translation!
 Costs [amount] [stockpiledResource] = Kost [amount] [stockpiledResource]
 Quantity of strategic resources produced by the empire +[relativeAmount]% = Hoeveelheid strategische grondstoffen geproduceerd door het rijk +[relativeAmount]%
 Double quantity of [resource] produced = Dubbele hoeveelheid van [resource] geproduceerd
@@ -2048,15 +2017,12 @@ May not generate great prophet equivalents naturally =
  # Requires translation!
 [baseUnitFilter] units built [cityFilter] can [action] [amount] extra times = 
 Starting tech = Starttechnologie
- # Requires translation!
 Starts with [tech] = Begin het spel met [tech]
  # Requires translation!
 Starts with [policy] adopted = 
 Triggers victory = Veroorzaakt een overwinning
 Triggers a Cultural Victory upon completion = Veroorzaakt een Culturele overwinning bij voltooiing
- # Requires translation!
 May not annex cities = Mag geen steden innemen
- # Requires translation!
 "Borrows" city names from other civilizations in the game = "Leen" stadsnamen van andere beschavingen in de spelsessie
  # Requires translation!
 Cities are razed [amount] times as fast = 
@@ -2189,7 +2155,6 @@ Earn [amount]% of the damage done to [combatantFilter] units as [civWideStat] =
 Upon capturing a city, receive [amount] times its [stat] production as [civWideStat] immediately = 
 Earn [amount]% of killed [mapUnitFilter] unit's [costOrStrength] as [civWideStat] = Krijg [amount]% van gedoode [mapUnitFilter] eenheden hun [costOrStrength] als [civWideStat]
 Earn [amount]% of [mapUnitFilter] unit's [costOrStrength] as [civWideStat] when killed within 4 tiles of a city following this religion = Verdien [amount]% van eenheidstype [mapUnitFilter] zijn [costOrStrength] als [civWideStat] wanneer gedood binnen 4 tegels van een stad met deze religie
- # Requires translation!
 May capture killed [mapUnitFilter] units = Kan verslagen [mapUnitFilter] eenheden gevangennemen
  # Requires translation!
 [amount] XP gained from combat = 
@@ -2227,9 +2192,7 @@ Is part of Great Person group [comment] =
 by consuming this unit = 
  # Requires translation!
 for [amount] movement = 
- # Requires translation!
 once = eenmaal
- # Requires translation!
 [amount] times = [amount] keer
  # Requires translation!
 [amount] additional time(s) = 
@@ -2280,7 +2243,6 @@ with [amount]% chance = met [amount]% kans
  # Requires translation!
 before [amount] turns = 
 after [amount] turns = na [amount] zetten
- # Requires translation!
 for [nationFilter] = voor [nationFilter]
  # Requires translation!
 when at war = 
@@ -2319,16 +2281,13 @@ before enhancing a religion =
  # Requires translation!
 after enhancing a religion = 
 if [buildingFilter] is constructed = als [buildingFilter] is gebouwd
- # Requires translation!
 with [resource] = met [resource]
- # Requires translation!
 without [resource] = zonder [resource]
  # Requires translation!
 when above [amount] [resource] = 
  # Requires translation!
 when below [amount] [resource] = 
 in this city = in deze stad
- # Requires translation!
 in other cities = in andere steden
  # Requires translation!
 in cities with a [buildingFilter] = 
@@ -2341,7 +2300,6 @@ for [mapUnitFilter] units = voor [mapUnitFilter] eenheden
 when [mapUnitFilter] = 
  # Requires translation!
 for units with [promotion] = 
- # Requires translation!
 for units without [promotion] = voor eenheden zonder [promotion]
 vs cities = vs steden
 vs [mapUnitFilter] units = tegen [mapUnitFilter] eenheden
@@ -2388,7 +2346,6 @@ Free Great Person = Gratis Groot Persoon
 [amount] population [cityFilter] = [amount] bevolking [cityFilter] 
  # Requires translation!
 [amount] population in a random city = 
- # Requires translation!
 Discover [tech] = Ontdek [tech]
  # Requires translation!
 Adopt [policy] = 
@@ -2681,7 +2638,6 @@ Map Panning =
 Unit Actions = 
  # Requires translation!
 Popups = 
- # Requires translation!
 Menu = Menu
  # Requires translation!
 Next Turn = 
@@ -2762,6 +2718,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
@@ -3675,7 +3633,6 @@ Gwalior = Gwalior
 Jaipur = Jaipur
 Karachi = Karachi
 India = Indië
- # Requires translation!
 [amount]% unhappiness from the number of Cities = [amount]% ongeluk van het aantal steden
 
 Otto von Bismarck = Otto von Bismarck
@@ -3748,7 +3705,6 @@ Suleiman I = Suleiman I
 Your continued insolence and failure to recognize and preeminence leads us to war. = Uw voortdurende brutaliteit en onvermogen om te erkennen en voorrang te geven, leidt ons naar oorlog.
 Good. The world shall witness the incontestable might of my armies and the glory of the Empire. = Goed. De wereld zal getuige zijn van de onevenaarbare macht van mijn legers en de glorie van het rijk.
 Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melancholy poets. = Vernietig! Vernietig! Istanbul wordt Iram van de Zuilen, alleen herinnerd door de melancholische dichters.
- # Requires translation!
 From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = De Ottomaanse natie groet je vanuit de grootsheid van Topkapi, vreemdeling!
 Let us do business! Would you be interested? = Laten we zaken doen! Zou u geïnteresseerd zijn?
 Barbary Corsairs = Barbaarse zeerovers
@@ -3870,243 +3826,130 @@ Iroquois = Irokezen
 All units move through Forest and Jungle Tiles in friendly territory as if they have roads. These tiles can be used to establish City Connections upon researching the Wheel. = Alle eenheden bewegen door bos- en jungle-tegels in vriendschappelijk gebied alsof deze wegen hebben. Deze tegels kunnen gebruikt worden om stadsverbindingen op te zetten zodra het Wiel ontdekt is.
 
 Darius I = Darius I
- # Requires translation!
 Your continue existence is an embarrassment to all leaders everywhere! You must be destroyed! = Je voortbestaan is een schande voor leiders over de hele wereld! Je moet vernietigd worden!
- # Requires translation!
 Curse you! You are beneath me, son of a donkey driver! I will crush you! = Vervloekt! Je staat onder mij, zoon van een ezelsdrijver! Ik zal je verpletteren!
- # Requires translation!
 You mongrel! Cursed be you! The world will long lament your heinous crime! = Jij scharminkel! Vervloekt ben je! De wereld zal zich lang je verschrikkelijke misdaad berouwen!
 Peace be on you! I am Darius, the great and outstanding king of kings of great Persia... but I suppose you knew that. = Vrede zij met jou! Ik ben Darius, de grote en uitstekende koning der koningen van geweldig Perzië... maar ik veronderstel dat je dat al wist.
 In my endless magnanimity, I am making you this offer. You agree, of course? = In mijn eindeloze grootheid doe ik je dit aanbod. Je gaat natuurlijk akkoord, hé?
 Good day to you! = Goeiedag!
 Ahh... you... = Ach... jij...
- # Requires translation!
 Achaemenid Legacy = Achaemenid Nalatenschap
- # Requires translation!
 Persepolis = Persepolis
- # Requires translation!
 Parsagadae = Parsagadae
- # Requires translation!
 Susa = Susa
- # Requires translation!
 Ecbatana = Ecbatana
- # Requires translation!
 Tarsus = Tarsus
- # Requires translation!
 Gordium = Gordium
- # Requires translation!
 Bactra = Bactra
- # Requires translation!
 Sardis = Sardis
- # Requires translation!
 Ergili = Ergili
- # Requires translation!
 Dariushkabir = Dariushkabir
- # Requires translation!
 Ghulaman = Ghulaman
- # Requires translation!
 Zohak = Zohak
- # Requires translation!
 Istakhr = Istakhr
- # Requires translation!
 Jinjan = Jinjan
- # Requires translation!
 Borazjan = Borazjan
- # Requires translation!
 Herat = Herat
- # Requires translation!
 Dakyanus = Dakyanus
- # Requires translation!
 Bampur = Bampur
- # Requires translation!
 Turengtepe = Turengtepe
- # Requires translation!
 Rey = Rey
- # Requires translation!
 Thuspa = Thuspa
- # Requires translation!
 Hasanlu = Hasanlu
- # Requires translation!
 Gabae = Gabae
- # Requires translation!
 Merv = Merv
- # Requires translation!
 Behistun = Behistun
- # Requires translation!
 Kandahar = Kandahar
- # Requires translation!
 Altintepe = Altintepe
- # Requires translation!
 Bunyan = Bunyan
- # Requires translation!
 Charsadda = Charsadda
- # Requires translation!
 Uratyube = Uratyube
- # Requires translation!
 Dura Europos = Dura Europos
- # Requires translation!
 Aleppo = Aleppo
- # Requires translation!
 Qatna = Qatna
- # Requires translation!
 Kabul = Kabul
- # Requires translation!
 Capisa = Capisa
- # Requires translation!
 Kyreskhata = Kyreskhata
- # Requires translation!
 Marakanda = Marakanda
- # Requires translation!
 Peshawar = Peshawar
- # Requires translation!
 Van = Van
- # Requires translation!
 Pteira = Pteira
- # Requires translation!
 Arshada = Arshada
- # Requires translation!
 Artakaona = Artakaona
- # Requires translation!
 Aspabota = Aspabota
- # Requires translation!
 Autiyara = Autiyara
- # Requires translation!
 Bagastana = Bagastana
- # Requires translation!
 Baxtri = Baxtri
- # Requires translation!
 Darmasa = Darmasa
- # Requires translation!
 Daphnai = Daphnai
- # Requires translation!
 Drapsaka = Drapsaka
- # Requires translation!
 Eion = Eion
- # Requires translation!
 Gandutava = Gandutava
- # Requires translation!
 Gaugamela = Gaugamela
- # Requires translation!
 Harmozeia = Harmozeia
- # Requires translation!
 Ekatompylos = Ekatompylos
- # Requires translation!
 Izata = Izata
- # Requires translation!
 Kampada = Kampada
- # Requires translation!
 Kapisa = Kapisa
- # Requires translation!
 Karmana = Karmana
- # Requires translation!
 Kounaxa = Kounaxa
- # Requires translation!
 Kuganaka = Kuganaka
- # Requires translation!
 Nautaka = Nautaka
- # Requires translation!
 Paishiyauvada = Paishiyauvada
- # Requires translation!
 Patigrbana = Patigrbana
- # Requires translation!
 Phrada = Phrada
 Persia = Perzië
 
- # Requires translation!
 Kamehameha I = Kamehameha I
- # Requires translation!
 The ancient fire flashing across the sky is what proclaimed that this day would come, though I had foolishly hoped for a different outcome. = Het oeroude vuur flitsend langs de hemel voorspelde dat deze dag zou komen, hoewel ik dwaas genoeg op een andere uitkomst had gehoopt.
 It is obvious now that I misjudged you and your true intentions. = Het is duidelijk nu dat ik jou en je echte bedoelingen verkeerd ingeschat heb.
- # Requires translation!
 The hard-shelled crab yields, and the lion lies down to sleep. Kanaloa comes for me now. = De krab met harde schaal geeft op, en de leeuw legt zich neer om te slapen. Kanaloa komt me halen.
- # Requires translation!
 Aloha! Greetings and blessings upon you, friend. I am Kamehameha, Great King of this strand of islands. = Aloha! Gegroet en gezegend, mijn vriend. Ik ben Kamehameha, Grote Koning van deze keten van eilanden.
- # Requires translation!
 Come, let our people feast together! = Kom, laat onze volken samen feestvieren!
- # Requires translation!
 Welcome, friend! = Welkom, vriend!
- # Requires translation!
 Wayfinding = Navigatie
 Honolulu = Honolulu
 Samoa = Samoa
 Tonga = Tonga
- # Requires translation!
 Nuku Hiva = Nuku Hiva
- # Requires translation!
 Raiatea = Raiatea
- # Requires translation!
 Aotearoa = Aotearoa
- # Requires translation!
 Tahiti = Tahiti
- # Requires translation!
 Hilo = Hilo
- # Requires translation!
 Te Wai Pounamu = Te Wai Pounamu
- # Requires translation!
 Rapa Nui = Rapa Nui
- # Requires translation!
 Tuamotu = Tuamotu
- # Requires translation!
 Rarotonga = Rarotonga
- # Requires translation!
 Tuvalu = Tuvalu
- # Requires translation!
 Tubuai = Tubuai
- # Requires translation!
 Mangareva = Mangareva
- # Requires translation!
 Oahu = Oahu
- # Requires translation!
 Kiritimati = Kiritimati
- # Requires translation!
 Ontong Java = Ontong Java
- # Requires translation!
 Niue = Niue
- # Requires translation!
 Rekohu = Rekohu
- # Requires translation!
 Rakahanga = Rakahanga
- # Requires translation!
 Bora Bora = Bora Bora
- # Requires translation!
 Kailua = Kailua
- # Requires translation!
 Uvea = Uvea
- # Requires translation!
 Futuna = Futuna
- # Requires translation!
 Rotuma = Rotuma
- # Requires translation!
 Tokelau = Tokelau
- # Requires translation!
 Lahaina = Lahaina
- # Requires translation!
 Bellona = Bellona
- # Requires translation!
 Mungava = Mungava
- # Requires translation!
 Tikopia = Tikopia
- # Requires translation!
 Emae = Emae
- # Requires translation!
 Kapingamarangi = Kapingamarangi
- # Requires translation!
 Takuu = Takuu
- # Requires translation!
 Nukuoro = Nukuoro
- # Requires translation!
 Sikaiana = Sikaiana
- # Requires translation!
 Anuta = Anuta
- # Requires translation!
 Nuguria = Nuguria
- # Requires translation!
 Pileni = Pileni
- # Requires translation!
 Nukumanu = Nukumanu
 Polynesia = Polynesië
 
- # Requires translation!
 Ramkhamhaeng = Ramkhamhaeng
  # Requires translation!
 You lowly, arrogant fool! I will make you regret of your insolence! = 
@@ -4119,69 +3962,37 @@ I, Pho Kun Ramkhamhaeng, King of Siam, consider it a great honor that you have w
  # Requires translation!
 Greetings. I believe this is a fair proposal for both parties. What do you think? = 
 Welcome. = Welkom.
- # Requires translation!
 Father Governs Children = Vader regeert over Kinderen
- # Requires translation!
 Sukhothai = Sukhothai
- # Requires translation!
 Si Satchanalai = Si Satchanalai
- # Requires translation!
 Muang Saluang = Muang Saluang
- # Requires translation!
 Lampang = Lampang
- # Requires translation!
 Phitsanulok = Phitsanulok
- # Requires translation!
 Kamphaeng Pet = Kamphaeng Pet
- # Requires translation!
 Nakhom Chum = Nakhom Chum
- # Requires translation!
 Vientiane = Vientiane
- # Requires translation!
 Nakhon Si Thammarat = Nakhon Si Thammarat
- # Requires translation!
 Martaban = Martaban
- # Requires translation!
 Nakhon Sawan = Nakhon Sawan
- # Requires translation!
 Chainat = Chainat
- # Requires translation!
 Luang Prabang = Luang Prabang
- # Requires translation!
 Uttaradit = Uttaradit
- # Requires translation!
 Chiang Thong = Chiang Thong
- # Requires translation!
 Phrae = Phrae
- # Requires translation!
 Nan = Nan
- # Requires translation!
 Tak = Tak
- # Requires translation!
 Suphanburi = Suphanburi
- # Requires translation!
 Hongsawadee = Hongsawadee
- # Requires translation!
 Thawaii = Thawaii
- # Requires translation!
 Ayutthaya = Ayutthaya
- # Requires translation!
 Taphan Hin = Taphan Hin
- # Requires translation!
 Uthai Thani = Uthai Thani
- # Requires translation!
 Lap Buri = Lap Buri
- # Requires translation!
 Ratchasima = Ratchasima
- # Requires translation!
 Ban Phai = Ban Phai
- # Requires translation!
 Loci = Loci
- # Requires translation!
 Khon Kaen = Khon Kaen
- # Requires translation!
 Surin = Surin
- # Requires translation!
 Siam = Siam
 
 Isabella = Isabella
@@ -4233,7 +4044,6 @@ Las Palmas = Las Palmas
 Tenerife = Tenerife
 Spain = Spanje
 
- # Requires translation!
 Askia = Askia
  # Requires translation!
 You are an abomination to heaven and earth, the chief of ignorant savages! You must be destroyed! = 
@@ -4245,69 +4055,37 @@ We have been consumed by the fires of hatred and rage. Enjoy your victory in thi
 I am Askia of the Songhai. We are a fair people - but those who cross us will find only destruction. You would do well to avoid repeating the mistakes others have made in the past. = 
  # Requires translation!
 Can I interest you in this deal? = 
- # Requires translation!
 River Warlord = Rivier Krijgsheer
- # Requires translation!
 Gao = Gao
- # Requires translation!
 Tombouctu = Tombouctu
- # Requires translation!
 Jenne = Jenne
- # Requires translation!
 Taghaza = Taghaza
- # Requires translation!
 Tondibi = Tondibi
- # Requires translation!
 Kumbi Saleh = Kumbi Saleh
- # Requires translation!
 Kukia = Kukia
- # Requires translation!
 Walata = Walata
- # Requires translation!
 Tegdaoust = Tegdaoust
- # Requires translation!
 Argungu = Argungu
- # Requires translation!
 Gwandu = Gwandu
- # Requires translation!
 Kebbi = Kebbi
- # Requires translation!
 Boussa = Boussa
- # Requires translation!
 Motpi = Motpi
- # Requires translation!
 Bamako = Bamako
- # Requires translation!
 Wa = Wa
- # Requires translation!
 Kayes = Kayes
- # Requires translation!
 Awdaghost = Awdaghost
- # Requires translation!
 Ouadane = Ouadane
- # Requires translation!
 Dakar = Dakar
- # Requires translation!
 Tadmekket = Tadmekket
- # Requires translation!
 Tekedda = Tekedda
- # Requires translation!
 Kano = Kano
- # Requires translation!
 Agadez = Agadez
- # Requires translation!
 Niamey = Niamey
- # Requires translation!
 Torodi = Torodi
- # Requires translation!
 Ouatagouna = Ouatagouna
- # Requires translation!
 Dori = Dori
- # Requires translation!
 Bamba = Bamba
- # Requires translation!
 Segou = Segou
- # Requires translation!
 Songhai = Songhai
 
 Genghis Khan = Genghis Khan
@@ -4397,7 +4175,6 @@ Ayotzinco = Ayotzinco
 Iztapam = Iztapam
 Aztecs = Azteken
 
- # Requires translation!
 Pachacuti = Pachacuti
  # Requires translation!
 Resistance is futile! You cannot hope to stand against the mighty Incan empire. If you will not surrender immediately, then prepare for war! = 
@@ -4415,75 +4192,40 @@ How are you doing? =
 What do you want now? = 
  # Requires translation!
 Great Andean Road = 
- # Requires translation!
 Cuzco = Cuzco
- # Requires translation!
 Tiwanaku = Tiwanaku
- # Requires translation!
 Machu = Machu
- # Requires translation!
 Ollantaytambo = Ollantaytambo
- # Requires translation!
 Corihuayrachina = Corihuayrachina
- # Requires translation!
 Huamanga = Huamanga
- # Requires translation!
 Rumicucho = Rumicucho
- # Requires translation!
 Vilcabamba = Vilcabamba
- # Requires translation!
 Vitcos = Vitcos
- # Requires translation!
 Andahuaylas = Andahuaylas
- # Requires translation!
 Ica = Ica
- # Requires translation!
 Arequipa = Arequipa
- # Requires translation!
 Nasca = Nasca
- # Requires translation!
 Atico = Atico
- # Requires translation!
 Juli = Juli
- # Requires translation!
 Chuito = Chuito
- # Requires translation!
 Chuquiapo = Chuquiapo
- # Requires translation!
 Huanuco Pampa = Huanuco Pampa
- # Requires translation!
 Tamboccocha = Tamboccocha
- # Requires translation!
 Huaras = Huaras
- # Requires translation!
 Riobamba = Riobamba
- # Requires translation!
 Caxamalca = Caxamalca
- # Requires translation!
 Sausa = Sausa
- # Requires translation!
 Tambo Colorado = Tambo Colorado
- # Requires translation!
 Huaca = Huaca
- # Requires translation!
 Tumbes = Tumbes
- # Requires translation!
 Chan Chan = Chan Chan
- # Requires translation!
 Sipan = Sipan
- # Requires translation!
 Pachacamac = Pachacamac
- # Requires translation!
 Llactapata = Llactapata
- # Requires translation!
 Pisac = Pisac
- # Requires translation!
 Kuelap = Kuelap
- # Requires translation!
 Pajaten = Pajaten
- # Requires translation!
 Chucuito = Chucuito
- # Requires translation!
 Choquequirao = Choquequirao
 Inca = Inca
  # Requires translation!
@@ -4505,98 +4247,53 @@ Hail to you. =
  # Requires translation!
 Viking Fury = 
 Copenhagen = Kopenhagen
- # Requires translation!
 Aarhus = Aarhus
- # Requires translation!
 Kaupang = Kaupang
- # Requires translation!
 Ribe = Ribe
- # Requires translation!
 Viborg = Viborg
- # Requires translation!
 Tunsberg = Tunsberg
- # Requires translation!
 Roskilde = Roskilde
- # Requires translation!
 Hedeby = Hedeby
 Oslo = Oslo
- # Requires translation!
 Jelling = Jelling
- # Requires translation!
 Truso = Truso
- # Requires translation!
 Bergen = Bergen
- # Requires translation!
 Faeroerne = Faeroerne
 Reykjavik = Reykjavik
 Trondheim = Trondheim
- # Requires translation!
 Godthab = Godthab
- # Requires translation!
 Helluland = Helluland
- # Requires translation!
 Lillehammer = Lillehammer
- # Requires translation!
 Markland = Markland
- # Requires translation!
 Elsinore = Elsinore
- # Requires translation!
 Sarpsborg = Sarpsborg
- # Requires translation!
 Odense = Odense
- # Requires translation!
 Aalborg = Aalborg
- # Requires translation!
 Stavanger = Stavanger
- # Requires translation!
 Vorbasse = Vorbasse
- # Requires translation!
 Schleswig = Schleswig
- # Requires translation!
 Kristiansand = Kristiansand
- # Requires translation!
 Halogaland = Halogaland
- # Requires translation!
 Randers = Randers
- # Requires translation!
 Fredrikstad = Fredrikstad
- # Requires translation!
 Kolding = Kolding
- # Requires translation!
 Horsens = Horsens
- # Requires translation!
 Tromsoe = Tromsoe
- # Requires translation!
 Vejle = Vejle
- # Requires translation!
 Koge = Koge
- # Requires translation!
 Sandnes = Sandnes
- # Requires translation!
 Holstebro = Holstebro
- # Requires translation!
 Slagelse = Slagelse
- # Requires translation!
 Drammen = Drammen
- # Requires translation!
 Hillerod = Hillerod
- # Requires translation!
 Sonderborg = Sonderborg
- # Requires translation!
 Skien = Skien
- # Requires translation!
 Svendborg = Svendborg
- # Requires translation!
 Holbaek = Holbaek
- # Requires translation!
 Hjorring = Hjorring
- # Requires translation!
 Fladstrand = Fladstrand
- # Requires translation!
 Haderslev = Haderslev
- # Requires translation!
 Ringsted = Ringsted
- # Requires translation!
 Skrive = Skrive
 Denmark = Denemarken
 
@@ -4606,7 +4303,6 @@ You leave us no choice. War it must be. =
 Very well, this shall not be forgotten. = 
  # Requires translation!
 I guess you weren't here for the sprouts after all... = 
- # Requires translation!
 Brussels = Brussel
 
  # Requires translation!
@@ -4617,12 +4313,10 @@ Florence = Florence
 So this is how it feels to die... = 
 Hanoi = Hanoi
 
- # Requires translation!
 Unacceptable! = Onaanvaardbaar!
 
  # Requires translation!
 Today, the Malay people obey you, but do not think this is over... = 
- # Requires translation!
 Kuala Lumpur = Kuala Lumpur
 
  # Requires translation!
@@ -4634,7 +4328,6 @@ Lhasa =
 You fiend! History shall remember this! = 
 Milan = Milaan
 
- # Requires translation!
 We were too weak to protect ourselves... = We waren te zwak om onszelf te beschermen...
  # Requires translation!
 Quebec City = 
@@ -4712,9 +4405,7 @@ Kathmandu =
 Perhaps, in another world, we could have been friends... = 
 Singapore = Singapore
 
- # Requires translation!
 We never fully trusted you from the start. = We hebben je nooit volledig vertrouwd.
- # Requires translation!
 Tyre = Tyre
 
  # Requires translation!
@@ -4960,7 +4651,6 @@ Engineer = Ingenieur
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 
 Agriculture = Agricultuur
 
- # Requires translation!
 'Shall the clay say to him that fashioneth it, what makest thou?' - Bible Isaiah 45:9 = 'Zegt de klei soms tegen wie hem vormt: 'Wat ben je eigenlijk aan het maken?'' - Bijbel Jesaja 45:9
 Pottery = Aardenwerk
  # Requires translation!
@@ -4973,7 +4663,6 @@ Archery = Boogschieten
 'The meek shall inherit the Earth, but not its mineral rights.' - J. Paul Getty = 
 Mining = Mijnbouw
 
- # Requires translation!
 'He who commands the sea has command of everything.' - Themistocles = 'Hij die de zee beheerst, beheerst alles.' - Themistocles
 Sailing = Zeilen
  # Requires translation!
@@ -5654,7 +5343,6 @@ Bowman = Boogschutter
 
 Slinger = Slingeraar
 
- # Requires translation!
 Skirmisher = Tirailleur
 
 Work Boats = Werkboten
@@ -5913,7 +5601,6 @@ Feed the World = Voedt de wereld
 
 Guruship = Guruschap
 
- # Requires translation!
 Holy Warriors = Heilige Krijgers
 
 Liturgical Drama = Liturgies drama
@@ -5976,13 +5663,11 @@ Reliquary = Reliekschrijn
 #################### Lines from Buildings from Civ V - Gods & Kings ####################
 
 
- # Requires translation!
 Stele = Stele
 
 
 Shrine = Altaar
 
- # Requires translation!
 Pyramid = Piramide
 
 
@@ -6030,7 +5715,6 @@ Neuschwanstein = Neuschwanstein
 '...the location is one of the most beautiful to be found, holy and unapproachable, a worthy temple for the divine friend who has brought salvation and true blessing to the world.' - King Ludwig II of Bavaria = 
 
 
- # Requires translation!
 Recycling Center = Recyclagecentrum
 
 
@@ -6601,7 +6285,6 @@ Freja =
  # Requires translation!
 Morten = 
 
- # Requires translation!
 Attila the Hun = Attila de Hun
  # Requires translation!
 I grow tired of this throne. I think I should like to have yours instead. = 
@@ -6611,35 +6294,21 @@ Now what is this?! You ask me to add your riches to my great avails. The invitat
 My people will mourn me not with tears, but with human blood. = 
  # Requires translation!
 You are in the presence of Attila, scourge of Rome. Do not let hubris be your downfall as well. = 
- # Requires translation!
 This is better than you deserve, but let it not be said that I am an unfair man. = Dit is beter dan je verdient, maar laat het niet gezegd zijnde dat ik een oneerlijk man ben.
  # Requires translation!
 Good day to you. = 
- # Requires translation!
 Scourge of God = Gesel Gods
- # Requires translation!
 Balamber = Balamber
- # Requires translation!
 Uldin = Uldin
- # Requires translation!
 Donatus = Donatus
- # Requires translation!
 Charato = Charato
- # Requires translation!
 Octar = Octar
- # Requires translation!
 Bleda = Bleda
- # Requires translation!
 Ellac = Ellac
- # Requires translation!
 Dengizik = Dengizik
- # Requires translation!
 Hildico = Hildico
- # Requires translation!
 Gudrun = Gudrun
- # Requires translation!
 Attila's Court = Atilla's Hof
- # Requires translation!
 The Huns = De Hunnen
 
 William of Orange = Willem van Oranje
@@ -6743,10 +6412,8 @@ Weesp =
 Coevorden = 
  # Requires translation!
 Kerkrade = 
- # Requires translation!
 The Netherlands = De Nederlanden
 
- # Requires translation!
 Gustavus Adolphus = Gustavus Adolphus
  # Requires translation!
 The Hakkapeliittas will ride again and your men will fall just at the sight of my cavalry! God with us! = 
@@ -6872,7 +6539,6 @@ Borgholm =
 Strängnäs = 
  # Requires translation!
 Sveg = 
- # Requires translation!
 Sweden = Zweden
 
  # Requires translation!
@@ -6971,7 +6637,6 @@ Saalbach =
 Lienz = 
  # Requires translation!
 Steyr = 
- # Requires translation!
 Austria = Oostenrijk
 
 Dido = Dido
@@ -7268,13 +6933,11 @@ Onchan =
 Dundee = 
  # Requires translation!
 Londonderry = 
- # Requires translation!
 Llanfairpwllgwyngyll = Llanfairpwllgwyngyll
  # Requires translation!
 Falmouth = 
  # Requires translation!
 Lorient = 
- # Requires translation!
 Celts = Kelten
 
  # Requires translation!
@@ -7377,14 +7040,10 @@ Gambela =
 Ziway = 
  # Requires translation!
 Weldiya = 
- # Requires translation!
 Ethiopia = Ethiopië
 
- # Requires translation!
 Pacal = Pacal
- # Requires translation!
 A sacrifice unlike all others must be made! = Een offer als geen ander moet gemaakt worden!
- # Requires translation!
 Muahahahahahaha! = Muahahahahahaha!
  # Requires translation!
 Today comes a great searing pain. With you comes the path to the black storm. = 
@@ -7492,7 +7151,6 @@ I didn't want to do this. We declare war. =
 I will fear no evil. For god is with me! = 
  # Requires translation!
 Why have you forsaken us my lord? = 
- # Requires translation!
 Bratislava = Bratislava
 
  # Requires translation!
@@ -7557,7 +7215,6 @@ an ancient prophecy =
 
  # Requires translation!
 'What is drama but life with the dull bits cut out.' - Alfred Hitchcock = 
- # Requires translation!
 Drama and Poetry = Drama en Poëzie
 
  # Requires translation!
@@ -7681,10 +7338,8 @@ Composite Bowman = Composietboogschutter
 Galleass = 
 
 
- # Requires translation!
 Privateer = Kaper
 
- # Requires translation!
 Sea Beggar = Watergeus
 
 
@@ -7703,7 +7358,6 @@ Mehal Sefari =
 Great War Infantry = 
 
 
- # Requires translation!
 Triplane = Driedekker
 
  # Requires translation!
@@ -7796,7 +7450,6 @@ Luxury Resource =
  # Requires translation!
 Luxury resources within your domain and with their specific improvement are connected to your trade network.\nEach unique Luxury resource you have adds 5 happiness to your civilization, but extra resources of the same type don't add anything, so use them for trading with other civilizations! = 
 
- # Requires translation!
 Strategic Resource = Strategische Grondstof
  # Requires translation!
 Strategic resources within your domain and with their specific improvement are connected to your trade network.\nStrategic resources allow you to train units and construct buildings that require those specific resources, for example the Horseman requires Horses. = 
@@ -8122,7 +7775,6 @@ One of your cities is under a naval blockade! When all adjacent water tiles of a
 
  # Requires translation!
 Keyboard Bindings = 
- # Requires translation!
 Limitations = Beperkingen
  # Requires translation!
 This is a work in progress. = 
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index b54ebd2306..d59a3e7219 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -4602,6 +4602,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index acf8d6e32e..ca1cfbd5cb 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -2601,6 +2601,8 @@ Transform =
 Repair = Ayusin
 Confirm Dialog = Kumpirmahin ang Diyalogo
 Cancel Dialog = Kanselahin ang Diyalogo
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index 2d70494139..7ce1b4fd06 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -3710,6 +3710,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 5080839f2c..a9d9b703bb 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -1684,7 +1684,6 @@ Dogfighting III = Combat aérien III
 Choose name for [unitName] = Choisir un nom pour [unitName]
 [unitFilter] units gain the [promotion] promotion = Les unités [unitFilter] gagnent la promotion [promotion]
 Requires = Nécessite
- # Requires translation!
 Path to [promotion] is ambiguous = Le chemin vers [promotion] est multiple
 
 # Multiplayer Turn Checker Service
@@ -2473,6 +2472,8 @@ Transform = Transformer
 Repair = Réparer
 Confirm Dialog = Confirmer (boîte de dialogue)
 Cancel Dialog = Annuler (boîte de dialogue)
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 8a4c921dde..0a099a53b9 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -2472,6 +2472,8 @@ Transform = Transformieren
 Repair = Reparieren
 Confirm Dialog = Dialog bestätigen
 Cancel Dialog = Dialog ablehnen
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties
index fe7cef0f27..a5b37a27dd 100644
--- a/android/assets/jsons/translations/Greek.properties
+++ b/android/assets/jsons/translations/Greek.properties
@@ -4176,6 +4176,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 6caed43618..5ffa24fbaa 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -2558,6 +2558,8 @@ Transform = Átalakítás
 Repair = Javítás
 Confirm Dialog = Párbeszédablak megerősítése
 Cancel Dialog = Párbeszédablak elvetése
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 1a385d74d3..681f332402 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -2557,6 +2557,8 @@ Transform =
 Repair = Perbaiki
 Confirm Dialog = Dialog Konfirmasi
 Cancel Dialog = Dialog Pembatalan
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index dd3363c73e..b094b85b24 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -2483,6 +2483,8 @@ Transform = Trasforma
 Repair = Ripara
 Confirm Dialog = Conferma dialogo
 Cancel Dialog = Cancella dialogo
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index 4afa94eb68..8dfb1281ca 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -2802,6 +2802,8 @@ Repair = 修復
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 143e07fbc6..fb866b3836 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -2670,6 +2670,8 @@ Repair = 수리
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index c8f50c32f4..e9cd86d062 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -2766,6 +2766,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index 63721b6f7b..29079fbe88 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -3714,6 +3714,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index 839c659567..f5a628e602 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -3968,6 +3968,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index 668f6c91ef..4fa9d1bbc9 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -3893,6 +3893,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index 200b35f46a..3ed208440c 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -1685,7 +1685,6 @@ Dogfighting III = Oczyszczanie Nieba III
 Choose name for [unitName] = Zmień nazwę dla: [unitName]
 [unitFilter] units gain the [promotion] promotion = Darmowy awans [promotion] otrzymują jednostki [unitFilter]
 Requires = Wymagania
- # Requires translation!
 Path to [promotion] is ambiguous = Istnieje więcej niż jedna ścieżka do [promotion] 
 
 # Multiplayer Turn Checker Service
@@ -2478,6 +2477,8 @@ Transform = Przekształć
 Repair = Napraw
 Confirm Dialog = Potwierdź okno dialogowe
 Cancel Dialog = Anuluj okno dialogowe 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index ec52a5d76f..17852fd688 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -2934,6 +2934,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index 77394461da..6433771118 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -3071,6 +3071,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index b060593f97..ea80010256 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -2514,6 +2514,8 @@ Transform = Трансформировать
 Repair = Отремонтировать
 Confirm Dialog = Подтвердить
 Cancel Dialog = Отклонить
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 230fccabae..bcac8a1293 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -2472,6 +2472,8 @@ Transform = 转换
 Repair = 修理
 Confirm Dialog = 确认对话框
 Cancel Dialog = 取消对话框
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index 8d44e78ee8..7ce32a9574 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -1684,7 +1684,6 @@ Dogfighting III = Combate aéreo III
 Choose name for [unitName] = Dar nombre a [unitName] 
 [unitFilter] units gain the [promotion] promotion = unidades [unitFilter] ganan la promoción [promotion]
 Requires = Requiere
- # Requires translation!
 Path to [promotion] is ambiguous = El camino a [promotion] es ambiguo
 
 # Multiplayer Turn Checker Service
@@ -2473,6 +2472,8 @@ Transform = Transformar Unidad
 Repair = Reparar
 Confirm Dialog = Confirmar Diálogo
 Cancel Dialog = Denegar Diálogo
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index 51181f2c1d..9c78709594 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -2801,6 +2801,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index cdecb0839b..812b7acf9e 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -2495,6 +2495,8 @@ Transform = 轉換
 Repair = 修復 
 Confirm Dialog = 確認對話框
 Cancel Dialog = 取消對話框
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index a69e84771b..7400bc62fa 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -3228,6 +3228,8 @@ Repair = Onar
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index 6e3d724598..a68bf53af6 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -2476,6 +2476,8 @@ Transform = Змінити
 Repair = Полагодити
 Confirm Dialog = Підтвердити дію
 Cancel Dialog = Скасувати дію
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties
index fa7a4b0a88..22d405a211 100644
--- a/android/assets/jsons/translations/Vietnamese.properties
+++ b/android/assets/jsons/translations/Vietnamese.properties
@@ -2761,6 +2761,8 @@ Repair =
 Confirm Dialog = 
  # Requires translation!
 Cancel Dialog = 
+ # Requires translation!
+Upgrade All = 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
 
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index 8944f9a332..6f5497beed 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -3,7 +3,7 @@ Italian = 99
 Russian = 99
 Belarusian = 2
 Afrikaans = 7
-German = 100
+German = 99
 Swedish = 86
 Turkish = 69
 Ukrainian = 99
@@ -29,5 +29,5 @@ English = 0
 Vietnamese = 93
 Czech = 83
 Hungarian = 78
-Dutch = 67
+Dutch = 74
 Greek = 15
diff --git a/changelog.md b/changelog.md
index f1c43f8ffd..621c83e5f8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,32 +1,19 @@
 ## 4.7.6
 
-Better image documentation for modders
+"Requires a [buildingFilter] in at least [amount] cities" works correctly with filters that aren't building names
 
-Actually generated unique type documentation
+AI only buys tiles contiguous to the current city tiles
 
-Added unique type documentation in wiki
-
-Resolves  - "Requires a [buildingFilter] in at least [amount] cities" works correctly with filters that aren't building names
-
-Resolves  - AI only buys tiles contiguous to the current city tiles (was: contiguous to civ tiles)
-
-chore: 'cityInfo' purge (changed to 'city' everywhere)
-
-Resolved  - no city window on citybutton click
-
-Revert "Solved strange concurrency crashes due to players keypress-activating disabled buttons"
-
-Undo Move button moved to far right, so other buttons stay in place
+Undo Move button moved to the right, so other buttons stay in place
 
 By SeventhM:
-- Check for triggers conditions 
-- Fix when units can be purchased 
+- Check for trigger conditions on new game techs
+- Fix when units can be purchased
 
 On City Raze, previous owner doesn't pay Road Maintenance  - By itanasi
 
 By SomeTroglodyte:
-- Defense against circular references in Promotions 
-- Architectural update - Make animated menu reusable 
+- Defense against circular references in Promotions
 
 ## 4.7.5
 
diff --git a/fastlane/metadata/android/en-US/changelogs/886.txt b/fastlane/metadata/android/en-US/changelogs/886.txt
index 51257b3ec3..0ac9f7a32c 100644
--- a/fastlane/metadata/android/en-US/changelogs/886.txt
+++ b/fastlane/metadata/android/en-US/changelogs/886.txt
@@ -1,29 +1,14 @@
+"Requires a [buildingFilter] in at least [amount] cities" works correctly with filters that aren't building names
 
+AI only buys tiles contiguous to the current city tiles
 
-Better image documentation for modders
-
-Actually generated unique type documentation
-
-Added unique type documentation in wiki
-
-Resolves  - "Requires a [buildingFilter] in at least [amount] cities" works correctly with filters that aren't building names
-
-Resolves  - AI only buys tiles contiguous to the current city tiles (was: contiguous to civ tiles)
-
-chore: 'cityInfo' purge (changed to 'city' everywhere)
-
-Resolved  - no city window on citybutton click
-
-Revert "Solved strange concurrency crashes due to players keypress-activating disabled buttons"
-
-Undo Move button moved to far right, so other buttons stay in place
+Undo Move button moved to the right, so other buttons stay in place
 
 By SeventhM:
-- Check for triggers conditions 
-- Fix when units can be purchased 
+- Check for trigger conditions on new game techs
+- Fix when units can be purchased
 
 On City Raze, previous owner doesn't pay Road Maintenance  - By itanasi
 
 By SomeTroglodyte:
-- Defense against circular references in Promotions 
-- Architectural update - Make animated menu reusable 
\ No newline at end of file
+- Defense against circular references in Promotions
\ No newline at end of file