diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index 6ae4624913..ff3a2159d1 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -2405,57 +2405,33 @@ You returned captured units to us = Você retornou uma unidade capturada para n
 #################### Lines from key bindings #######################
 
 World Screen = Tela do Mundo
- # Requires translation!
-Unit Actions = 
- # Requires translation!
-Popups = 
+Unit Actions = Ações da Unidade
+Popups = Pop-ups
 Next Turn = Próximo Turno
 Next Turn Alternate = Próximo Turno Alternativo
 Empire Overview = Visão Geral do Império
- # Requires translation!
-Empire Overview Trades = 
- # Requires translation!
-Empire Overview Units = 
- # Requires translation!
-Empire Overview Politics = 
- # Requires translation!
-Social Policies = 
- # Requires translation!
-Technology Tree = 
- # Requires translation!
-Empire Overview Notifications = 
- # Requires translation!
-Empire Overview Stats = 
- # Requires translation!
-Empire Overview Resources = 
- # Requires translation!
-Quick Save = 
- # Requires translation!
-Quick Load = 
- # Requires translation!
-View Capital City = 
- # Requires translation!
-Save Game = 
- # Requires translation!
-Load Game = 
- # Requires translation!
-Quit Game = 
- # Requires translation!
-Toggle UI = 
- # Requires translation!
-Toggle Resource Display = 
- # Requires translation!
-Toggle Yield Display = 
- # Requires translation!
-Toggle Worked Tiles Display = 
- # Requires translation!
-Toggle Movement Display = 
- # Requires translation!
-Zoom In = 
- # Requires translation!
-Zoom Out = 
- # Requires translation!
-Transform = 
+Empire Overview Trades = Visão Geral do Império Negociações
+Empire Overview Units = Visão Geral do Império Unidades
+Empire Overview Politics = Visão Geral do Império Política
+Social Policies = Políticas sociais
+Technology Tree = Árvore Tecnológica
+Empire Overview Notifications = Notificações de Visão Geral do Império
+Empire Overview Stats = Estatísticas de Visão Geral do Império
+Empire Overview Resources = Recursos de Visão Geral do Império
+Quick Save = Salvar Jogo Rapido
+Quick Load = Carregar Jogo Rapido
+View Capital City = ver capital
+Save Game = Salvar Jogo
+Load Game = Carregar Jogo
+Quit Game = Sair do jogo
+Toggle UI = Alternar IU
+Toggle Resource Display = Alternar Exibição de Recursos
+Toggle Yield Display = Alternar Exibição de Rendimento
+Toggle Worked Tiles Display = Alternar exibição de ladrilhos trabalhados
+Toggle Movement Display = Alternar Exibição de Movimento
+Zoom In = Mais Zoom
+Zoom Out = Reduzir o Zoom
+Transform = Transformar
 Repair = Reparar
 Confirm Dialog = Confirmar Diálogo
 Cancel Dialog = Cancelar Diálogo
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index a56ad820c3..2bd3429a23 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -2406,56 +2406,56 @@ You returned captured units to us = Vous nous avez rendu des unités capturées
 
 World Screen = Écran de jeu
  # Requires translation!
-Unit Actions = 
+Unit Actions = Actions des unités
  # Requires translation!
-Popups = 
+Popups = Fenêtres
 Next Turn = Tour suivant
 Next Turn Alternate = Tour suivant (alt)
 Empire Overview = Vue d'ensemble
  # Requires translation!
-Empire Overview Trades = 
+Empire Overview Trades = Vue d'ensemble - Échanges
  # Requires translation!
-Empire Overview Units = 
+Empire Overview Units = Vue d'ensemble - Unités
  # Requires translation!
-Empire Overview Politics = 
+Empire Overview Politics = Vue d'ensemble - Politique
  # Requires translation!
-Social Policies = 
+Social Policies = Doctrines
  # Requires translation!
-Technology Tree = 
+Technology Tree = Arbre des Technologies
  # Requires translation!
-Empire Overview Notifications = 
+Empire Overview Notifications = Vue d'ensemble - Notifications
  # Requires translation!
-Empire Overview Stats = 
+Empire Overview Stats = Vue d'ensemble - Statistiques
  # Requires translation!
-Empire Overview Resources = 
+Empire Overview Resources = Vue d'ensemble - Ressources
  # Requires translation!
-Quick Save = 
+Quick Save = Sauvegarde rapide
  # Requires translation!
-Quick Load = 
+Quick Load = Chargement rapide
  # Requires translation!
-View Capital City = 
+View Capital City = Centrer sur la Capitale
  # Requires translation!
-Save Game = 
+Save Game = Sauvegarder une partie
  # Requires translation!
-Load Game = 
+Load Game = Charger une partie
  # Requires translation!
-Quit Game = 
+Quit Game = Quitter le jeu
  # Requires translation!
-Toggle UI = 
+Toggle UI = Interface on/off
  # Requires translation!
-Toggle Resource Display = 
+Toggle Resource Display = Affichage des ressources on/off
  # Requires translation!
-Toggle Yield Display = 
+Toggle Yield Display = Affichage des rendements on/off
  # Requires translation!
-Toggle Worked Tiles Display = 
+Toggle Worked Tiles Display = Affichage des cases exploitées on/off
  # Requires translation!
-Toggle Movement Display = 
+Toggle Movement Display = Affichage des déplacements on/off
  # Requires translation!
-Zoom In = 
+Zoom In = Zoom
  # Requires translation!
-Zoom Out = 
+Zoom Out = Dézoom
  # Requires translation!
-Transform = 
+Transform = Transformer
 Repair = Réparer
 Confirm Dialog = Confirmer (boîte de dialogue)
 Cancel Dialog = Annuler (boîte de dialogue)
@@ -6439,7 +6439,7 @@ Limitations = Limitations
 This is a work in progress. = Cette fonctionnalité est partiellement implémentée.
 For technical reasons, only direct keys or Ctrl-Letter combinations can be used. = Pour des raisons techniques, seules les touches directes ou les combinaisons CTRL+lettre peuvent être utilisées.
 The Escape key is intentionally excluded from being reassigned. = La touche Échap est intentionnellement exclue des attributions de touches.
-Currently, there are no checks to prevent conflicting assignments. = Pour l'instant, les conflits d'attribution ne sont pas vérifiés.
+Currently, there are no checks to prevent conflicting assignments. = Pour le moment, les conflits d'attribution ne sont pas vérifiés.
 Using the Keys page = Utilisation de la page Touches
 Each binding has a button with an image looking like this: = Chaque raccourci dispose d'un bouton accompagné d'une image, comme ceci :
 While hovering the mouse over the key button, you can press a desired key directly to assign it. = En survolant la touche définie avec la souris, vous pouvez directement appuyer sur la touche désirée pour l'attribuer. 
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 98f5721186..41fb037b89 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -296,10 +296,8 @@ Non-existent city = Nicht-existierende Stadt
 # Unit differences
 
 [resourceName] not required = [resourceName] nicht erforderlich
- # Requires translation!
-Lost ability (vs [originalUnit]): [ability] = 
- # Requires translation!
-Upgrade all [count] [unit] ([cost] gold) = 
+Lost ability (vs [originalUnit]): [ability] = Fähigkeit [ability] von [originalUnit] verloren
+Upgrade all [count] [unit] ([cost] gold) = Alle [count] [unit] aufrüsten für [cost] Gold
 National ability = Nationalfähigkeit
 [firstValue] vs [secondValue] = [firstValue] anstatt [secondValue]
 Gained = Erhalten
@@ -521,8 +519,7 @@ Current map: World Wrap = Aktuelle Karte: World Wrap
 Overlay image = Überlagerungsbild
 Click to choose a file = Anklicken, um eine Datei auszuwählen
 Choose an image = Wähle ein Bild
- # Requires translation!
-Overlay opacity: = 
+Overlay opacity: = Deckungsgrad Überlagerung
 Invalid overlay image = Ungültiges Überlagerungsbild
 World wrap is incompatible with an overlay and was deactivated. = World Wrap ist mit einer Überlagerung nicht kompatibel und wurde deaktiviert.
 An overlay image is incompatible with world wrap and was deactivated. = Ein Überlagerungsbild ist nicht mit dem World Wrap kompatibel und wurde deaktiviert.
@@ -788,12 +785,9 @@ Currently playing: [title] = Aktuelle Wiedergabe: [title]
 Download music = Musik herunterladen
 Downloading... = Lade herunter...
 Could not download music! = Musik konnte nicht heruntergeladen werden!
- # Requires translation!
-—Paused— = 
- # Requires translation!
-—Default— = 
- # Requires translation!
-—History— = 
+—Paused— = —Pause—
+—Default— = —Standard—
+—History— = —Historie—
 
 ## Advanced tab
 Advanced = Erweitert
@@ -816,6 +810,7 @@ Enable display cutout (requires restart) = Aktiviere Bildschirmausschnitt (Neust
 ## Keys tab
 Keys = Tastenzuordnung
 Please see the Tutorial. = Bitte schau dir das Tutorial an.
+Hit the desired key now = Drücke die gewünschte Taste
 
 ## Locate mod errors tab
 Locate mod errors = Mod-Probleme
@@ -1390,8 +1385,7 @@ Allied with [civName] = Verbündet mit [civName]
 Civilization Info = Zivilisations-Informationen
 Relations = Beziehungen
 Trade request = Handelsanfrage
- # Requires translation!
-Garrisoned by unit = 
+Garrisoned by unit = Garnisioniert durch
 
 # Victory
 
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 00ab606eb7..a1c31abdb3 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -302,10 +302,8 @@ Lost ability (vs [originalUnit]): [ability] =
 Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Nemzeti képesség
 [firstValue] vs [secondValue] = [firstValue], [secondValue] helyett
- # Requires translation!
-Gained = 
- # Requires translation!
-Lost = 
+Gained = Szerzett
+Lost = Elveszített
 
 
 # New game screen
@@ -525,10 +523,8 @@ The incompatible elements have been removed. = A nem kompatibilis elemeket eltá
 Current map: World Wrap = 
  # Requires translation!
 Overlay image = 
- # Requires translation!
-Click to choose a file = 
- # Requires translation!
-Choose an image = 
+Click to choose a file = Kattints a fájl kiválasztásához
+Choose an image = Válassz egy képet
  # Requires translation!
 Overlay opacity: = 
  # Requires translation!
@@ -636,10 +632,10 @@ You can only resign if it's your turn = Csak a te körödben adhatod fel
 [civName] resigned and is now controlled by AI = [civName] feladta és már a gép irányítja
 Last refresh: [duration] ago = Legutóbbi frissítés: [duration] ezelőtt
 Current Turn: [civName] since [duration] ago = Jelenlegi kör: [civName] [duration] ezelőtt kezdte meg
-Seconds = másodperc
-Minutes = perc
-Hours = óra
-Days = nap
+Seconds = Másodperc
+Minutes = Perc
+Hours = Óra
+Days = Nap
 [amount] Seconds = [amount] másodperc
 [amount] Minutes = [amount] perc
 [amount] Hours = [amount] óra
@@ -740,16 +736,11 @@ UI Skin = Testreszabott felhasználói felület
  # Requires translation!
 UI = 
 
- # Requires translation!
-Notifications on world screen = 
- # Requires translation!
-Disabled = 
- # Requires translation!
-Hidden = 
- # Requires translation!
-Visible = 
- # Requires translation!
-Permanent = 
+Notifications on world screen = Értesítések a világ kijelzőjén
+Disabled = Kikapcsolva
+Hidden = Rejtett
+Visible = Látható
+Permanent = Állandó
 
 Minimap size = Kistérkép mérete
 
@@ -763,8 +754,7 @@ Experimental Demographics scoreboard = Demográfiai eredményjelző (kísérleti
 
 ### Visual Hints subgroup
 
- # Requires translation!
-Visual Hints = 
+Visual Hints = Látható segítségek
 Show worked tiles = Megmunkált mezők mutatása
 Show resources and improvements = Erőforrások és területfejlesztések mutatása
 Show tile yields = Mező termelésének mutatása
@@ -1255,10 +1245,8 @@ Please select a tile for this building's [improvement] = Kérlek, válaszd ki a
 Invalid input! Please enter a different string. = A beírt szöveg nem elfogadható! Kérlek, írj be másikat.
 Invalid input! Please enter a valid number. = A beírt érték nem érvényes szám! Kérlek, írd be helyesen.
 Please enter some text = Kérlek, írj be valamilyen szöveget
- # Requires translation!
-Please enter a file name = 
- # Requires translation!
-File name: = 
+Please enter a file name = Írd be egy fájl nevét
+File name: = Fájl név
 
 # Technology UI
 
@@ -1441,8 +1429,7 @@ Capture ? * [cityName] =
 Our status = Státuszunk
 Global status = Globális státusz
 Rankings = Ranglista
- # Requires translation!
-Charts = 
+Charts = Diagramok
 Demographics = Népességadatok
 Demographic = Demográfiai
 Rank = Helyezés
@@ -2195,15 +2182,14 @@ 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
- # Requires translation!
-in other cities = 
+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]
 with a garrison = beszállásolt egység esetén
 for [mapUnitFilter] units = [mapUnitFilter] egységeknek
  # Requires translation!
-when [mapUnitFilter] = 
+when [mapUnitFilter] = amikor [mapUnitFilter]
 for units with [promotion] = [promotion] előléptetéssel rendelkező egységeknek
 for units without [promotion] = [promotion] nélküli egységeknek
 vs cities = városok ellen
@@ -2455,8 +2441,7 @@ You returned captured units to us = Elfogott egységeket juttattatok vissza hozz
 World Screen = Pályaképernyő
  # Requires translation!
 Unit Actions = 
- # Requires translation!
-Popups = 
+Popups = Felugró ablakok
 Next Turn = Következő kör
 Next Turn Alternate = Következő kör (másodlagos)
 Empire Overview = Birodalom áttekintése
@@ -2476,18 +2461,12 @@ Empire Overview Notifications =
 Empire Overview Stats = 
  # Requires translation!
 Empire Overview Resources = 
- # Requires translation!
-Quick Save = 
- # Requires translation!
-Quick Load = 
- # Requires translation!
-View Capital City = 
- # Requires translation!
-Save Game = 
- # Requires translation!
-Load Game = 
- # Requires translation!
-Quit Game = 
+Quick Save = Gyors Mentés
+Quick Load = Gyors Betöltés
+View Capital City = Főváros megtekintése
+Save Game = Játék Mentése
+Load Game = Játék Betöltése
+Quit Game = Kilépés a Játékból
  # Requires translation!
 Toggle UI = 
  # Requires translation!
@@ -2498,12 +2477,9 @@ Toggle Yield Display =
 Toggle Worked Tiles Display = 
  # Requires translation!
 Toggle Movement Display = 
- # Requires translation!
-Zoom In = 
- # Requires translation!
-Zoom Out = 
- # Requires translation!
-Transform = 
+Zoom In = Nagyítás
+Zoom Out = Kicsinyítés
+Transform = Átalakítás
 Repair = Javítás
 Confirm Dialog = Párbeszédablak megerősítése
 Cancel Dialog = Párbeszédablak elvetése
@@ -3080,8 +3056,7 @@ Welcome. I'm Napoleon, of France; the smartest military man in world history. =
 France offers you this exceptional proposition. = Franciaország ezzel a kivételes ajánlattal fordul hozzád.
 Hello. = Üdv.
 It's you. = Te?!
- # Requires translation!
-Ancien Régime = 
+Ancien Régime = Régi Rendszer
 Paris = Párizs
 Orleans = Orléans
 Lyon = Lyon
@@ -3438,8 +3413,7 @@ Guten Tag. In the name of the great German people, I bid you welcome. = Guten Ta
 It would be in your best interest, to carefully consider this proposal. = A te érdekedet is az szolgálná a legjobban, ha alaposan megfontolnád ezt az ajánlatot.
 What now? = Mi az megint?
 So, out with it! = Szóval, ki vele!
- # Requires translation!
-Furor Teutonicus = 
+Furor Teutonicus = Holland Düh
 Berlin = Berlin
 Hamburg = Hamburg
 Munich = München
@@ -3499,16 +3473,13 @@ Erlangen = Erlangen
 Germany = Németország
 
 Suleiman I = I. Szulejmán
- # Requires translation!
-Your continued insolence and failure to recognize and preeminence leads us to war. = 
- # Requires translation!
-Good. The world shall witness the incontestable might of my armies and the glory of the Empire. = 
+Your continued insolence and failure to recognize and preeminence leads us to war. = Folyamatos szemtelenséged, felismerésed és elsőbbséged háborúhoz vezet bennünket.
+Good. The world shall witness the incontestable might of my armies and the glory of the Empire. = Jó. A világ tanúja lesz seregeim vitathatatlan erejének és a Birodalom dicsőségének.
  # Requires translation!
 Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melancholy poets. = 
  # 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! = 
- # Requires translation!
-Let us do business! Would you be interested? = 
+Let us do business! Would you be interested? = Csináljunk üzletet! Érdekelne?
 Barbary Corsairs = Berber kalózok
 Istanbul = Isztambul
 Edirne = Edirne
@@ -3556,10 +3527,8 @@ Foolish, miserable wretch! You will be crushed by this country's magnificent sci
 Now the question is who will protect my people. A dark age has come. = 
  # Requires translation!
 Welcome to the palace of Choson, stranger. I am the learned King Sejong, who looks after his great people. = 
- # Requires translation!
-We have many things to discuss and have much to benefit from each other. = 
- # Requires translation!
-Oh, it's you = 
+We have many things to discuss and have much to benefit from each other. = Sok dolgot kell megbeszélnünk és sok hasznot szerzünk egymástól.
+Oh, it's you = Oh, te vagy az.
 Scholars of the Jade Hall = Az érdemesek csarnokának tudósai
 Seoul = Szöul
 Busan = Puszan
@@ -4364,10 +4333,8 @@ Ringsted = Ringsted
 Skrive = Skrive
 Denmark = Dánia
 
- # Requires translation!
-You leave us no choice. War it must be. = 
- # Requires translation!
-Very well, this shall not be forgotten. = 
+You leave us no choice. War it must be. = Nem hagysz nekünk más lehetőséget. Háború legyen akkor.
+Very well, this shall not be forgotten. = Rendben, ez sose lesz elfelejtve.
  # Requires translation!
 I guess you weren't here for the sprouts after all... = 
 Brussels = Brüsszel
@@ -4376,8 +4343,7 @@ Brussels = Brüsszel
 And so the flower of Florence falls to barbaric hands... = 
 Florence = Firenze
 
- # Requires translation!
-So this is how it feels to die... = 
+So this is how it feels to die... = Szóval ilyen érzés meghalni...
 Hanoi = Hanoi
 
 Unacceptable! = Elfogadhatatlan!
@@ -4386,16 +4352,14 @@ Unacceptable! = Elfogadhatatlan!
 Today, the Malay people obey you, but do not think this is over... = 
 Kuala Lumpur = Kuala Lumpur
 
- # Requires translation!
-Perhaps now we will find peace in death... = 
+Perhaps now we will find peace in death... = Talán most mi békét találunk halálunkban...
 Lhasa = Lhásza
 
  # Requires translation!
 You fiend! History shall remember this! = 
 Milan = Milánó
 
- # Requires translation!
-We were too weak to protect ourselves... = 
+We were too weak to protect ourselves... = Túl gyengék voltunk saját magunk megvédésére...
 Quebec City = Québec
 
  # Requires translation!
@@ -4448,8 +4412,7 @@ Vancouver = Vancouver
 
  # Requires translation!
 You have revealed your purposes a bit too early, my friend... = 
- # Requires translation!
-A wrong calculation, on my part. = 
+A wrong calculation, on my part. = Egy rossz számítás, az én oldalamon.
 Venice = Velence
 
  # Requires translation!
@@ -4460,16 +4423,13 @@ Antwerp = Antwerpen
 How barbaric. Those who live by the sword shall perish by the sword. = 
 Genoa = Genova
 
- # Requires translation!
-We... defeated? No... we had so much work to do! = 
+We... defeated? No... we had so much work to do! = Mi...legyőzve? Ne... olyan sok dolgunk volt!
 Kathmandu = Katmandu
 
- # Requires translation!
-Perhaps, in another world, we could have been friends... = 
+Perhaps, in another world, we could have been friends... = Talán, egy másik világban, barátok lehettünk volna...
 Singapore = Szingapúr
 
- # Requires translation!
-We never fully trusted you from the start. = 
+We never fully trusted you from the start. = A kezdet óta sose bíztunk meg teljesen.
 Tyre = Türosz
 
  # Requires translation!
@@ -4821,8 +4781,7 @@ Railroads = Vasút
 Refrigeration = Hűtés
  # Requires translation!
 'I once sent a dozen of my friends a telegram saying 'flee at once-all is discovered!' They all left town immediately.' - Mark Twain = 
- # Requires translation!
-Telegraph = 
+Telegraph = Távirat
 'The whole country was tied together by radio. We all experienced the same heroes and comedians and singers. They were giants.' - Woody Allen = 'Az egész országot összekötötte a rádió. Ugyanazokat a hősöket, énekeseket és komikusokat ismertük. Óriások voltak.' - Woody Allen
 Radio = Rádió
 'Aeronautics was neither an industry nor a science. It was a miracle.' - Igor Sikorsky = 'Az aeronautika nem egy iparág vagy tudomány volt, hanem egy csoda.' - Igor Sikorsky
@@ -4838,8 +4797,7 @@ Plastics = Műanyag
 Electronics = Elektronika
  # Requires translation!
 'The speed of communications is wondrous to behold, it is also true that speed does multiply the distribution of information that we know to be untrue.' – Edward R. Murrow = 
- # Requires translation!
-Mass Media = 
+Mass Media = Tömegmédia
 'Vision is the art of seeing things invisible.' - Jonathan Swift = 'Az éleslátás a láthatatlan dolgok észrevételének művészete.' - Jonathan Swift
 Radar = Radar
 'The unleashed power of the atom has changed everything save our modes of thinking, and we thus drift toward unparalleled catastrophes.' - Albert Einstein = 'Az atomenergia felszabadulása nem okozott új problémát. Csak sürgetőbbé tette, hogy megoldjunk egy létezőt.' - Albert Einstein
@@ -5347,8 +5305,7 @@ Hoplite = Hoplita
 
 Persian Immortal = Halhatatlan
 
- # Requires translation!
-Marauder = 
+Marauder = Martalóc
 
 Horseman = Lovas
 
@@ -5685,8 +5642,7 @@ Ceilidh Hall = Ceilidh terem
 
 
 Leaning Tower of Pisa = Pisai ferde torony
- # Requires translation!
-'Don't clap too hard - it's a very old building.' - John Osbourne = 
+'Don't clap too hard - it's a very old building.' - John Osbourne = 'Ne tapsolj nagyon erősen - ez egy nagyon idős épület.' - John Osbourne
 
 
 Coffee House = Kávéház
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index d87fd34866..6bc67a2394 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -297,9 +297,9 @@ Non-existent city = Ciudad Inexistente
 
 [resourceName] not required = no se requiere [resourceName]
  # Requires translation!
-Lost ability (vs [originalUnit]): [ability] = 
+Lost ability (vs [originalUnit]): [ability] = Abilidad perdida (vs [originalUnit]): [ability]
  # Requires translation!
-Upgrade all [count] [unit] ([cost] gold) = 
+Upgrade all [count] [unit] ([cost] gold) = Mejorar todos los [count] [unit] ([cost] gold)
 National ability = Habilidad nacional
 [firstValue] vs [secondValue] = [firstValue] vs. [secondValue]
 Gained = Ganado
@@ -522,7 +522,7 @@ Overlay image = Imagen superpuesta
 Click to choose a file = Toca para seleccionar un archivo
 Choose an image = Escoge una imagen
  # Requires translation!
-Overlay opacity: = 
+Overlay opacity: = Transparencia de la imagen
 Invalid overlay image = Imagen inválida para superponer
 World wrap is incompatible with an overlay and was deactivated. = El Mapa Envolvente es incompatible con una imagen superpuesta, y ha sido DESACTIVADO
 An overlay image is incompatible with world wrap and was deactivated. = Una imagen superpuesta es incompatible con Mapa Envolvente y ha sido DESACTIVADA
@@ -789,11 +789,11 @@ Download music = Descargar música
 Downloading... = Descargando...
 Could not download music! = ¡No se pudo descargar la música!
  # Requires translation!
-—Paused— = 
+—Paused— = —Pausado—
  # Requires translation!
-—Default— = 
+—Default— = —Defacto—
  # Requires translation!
-—History— = 
+—History— = —Historial—
 
 ## Advanced tab
 Advanced = Avanzado
@@ -1391,7 +1391,7 @@ Civilization Info = Info. de la Civilización
 Relations = Relaciones
 Trade request = Propuesta de Comercio
  # Requires translation!
-Garrisoned by unit = 
+Garrisoned by unit = Guarnición con unidad
 
 # Victory
 
@@ -2413,56 +2413,56 @@ You returned captured units to us = Nos has devuelto unidades capturadas
 
 World Screen = Pantalla del Mundo
  # Requires translation!
-Unit Actions = 
+Unit Actions = Acciones de Unidad
  # Requires translation!
-Popups = 
+Popups = Ventanas Emergentes
 Next Turn = Siguiente Turno
 Next Turn Alternate = Siguiente Turno Alterno
 Empire Overview = Visión General
  # Requires translation!
-Empire Overview Trades = 
+Empire Overview Trades = Visión General - Comercio
  # Requires translation!
-Empire Overview Units = 
+Empire Overview Units = Visión General - Unidades
  # Requires translation!
-Empire Overview Politics = 
+Empire Overview Politics = Visión General - Política
  # Requires translation!
-Social Policies = 
+Social Policies = Políticas Sociales
  # Requires translation!
-Technology Tree = 
+Technology Tree = Árbol Tecnológico
  # Requires translation!
-Empire Overview Notifications = 
+Empire Overview Notifications = Visión General - Notificaciones
  # Requires translation!
-Empire Overview Stats = 
+Empire Overview Stats = Visión General - Estadísticas
  # Requires translation!
-Empire Overview Resources = 
+Empire Overview Resources = Visión General - Recursos
  # Requires translation!
-Quick Save = 
+Quick Save = Guardado Rápido
  # Requires translation!
-Quick Load = 
+Quick Load = Cargar Rápido
  # Requires translation!
-View Capital City = 
+View Capital City = Ver Ciudad Capital
  # Requires translation!
-Save Game = 
+Save Game = Guardar Partida
  # Requires translation!
-Load Game = 
+Load Game = Cargar Partida
  # Requires translation!
-Quit Game = 
+Quit Game = Salir del Juego
  # Requires translation!
-Toggle UI = 
+Toggle UI = Des/Activar IU
  # Requires translation!
-Toggle Resource Display = 
+Toggle Resource Display = Des/Activar Iconos de Recursos
  # Requires translation!
-Toggle Yield Display = 
+Toggle Yield Display = Des/Activar Ver Rendimientos
  # Requires translation!
-Toggle Worked Tiles Display = 
+Toggle Worked Tiles Display = Des/Activar Ver Casillas Trabajadas
  # Requires translation!
-Toggle Movement Display = 
+Toggle Movement Display = Des/Activar Ver Movimientos
  # Requires translation!
-Zoom In = 
+Zoom In = Acercar Mapa
  # Requires translation!
-Zoom Out = 
+Zoom Out = Alejar Mapa
  # Requires translation!
-Transform = 
+Transform = Transformar Unidad
 Repair = Reparar
 Confirm Dialog = Confirmar Diálogo
 Cancel Dialog = Denegar Diálogo
diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties
index 049d6f71eb..cbf5804f8f 100644
--- a/android/assets/jsons/translations/template.properties
+++ b/android/assets/jsons/translations/template.properties
@@ -703,10 +703,6 @@ Borderless =
 
 Screen Size = 
 
-Landscape (fixed) = 
-Portrait (fixed) = 
-Auto (sensor adjusted) = 
-
 ### Enable panning the map when you move the mouse to the edge of the window
 Map mouse auto-scroll = 
 Map panning speed = 
@@ -728,6 +724,8 @@ Visible =
 Permanent = 
 
 Minimap size = 
+# This is the leftmost Minimap size slider position
+off = 
 
 Show tutorials = 
 Reset tutorials = 
@@ -756,13 +754,14 @@ When disabled, saves battery life but certain animations will be suspended =
 
 ## Gameplay tab
 Gameplay = 
+Check for idle units = 
+Auto Unit Cycle = 
+Move units with a single tap = 
 Auto-assign city production = 
 Auto-build roads = 
 Automated workers replace improvements = 
 Automated units move on turn start = 
-Check for idle units = 
-Auto Unit Cycle = 
-Move units with a single tap = 
+Order trade offers by amount = 
 Ask for confirmation when pressing next turn = 
 Notifications log max turns = 
 
@@ -791,26 +790,33 @@ Could not download music! =
 
 ## Advanced tab
 Advanced = 
-Generate translation files = 
-Translation files are generated successfully. = 
-Fastlane files are generated successfully. = 
-Update Mod categories = 
+Turns between autosaves = 
 
 Screen orientation = 
+Landscape (fixed) = 
+Portrait (fixed) = 
+Auto (sensor adjusted) = 
+
+Enable display cutout (requires restart) = 
+
+Max zoom out = 
 
 Font family = 
 Font size multiplier = 
 Default Font = 
 
+Generate translation files = 
+Translation files are generated successfully. = 
+Fastlane files are generated successfully. = 
+Update Mod categories = 
+
 Enable Easter Eggs = 
 Enlarge selected notifications = 
 
-Order trade offers by amount = 
-Enable display cutout (requires restart) = 
-
 ## Keys tab
 Keys = 
 Please see the Tutorial. = 
+Hit the desired key now = 
 
 ## Locate mod errors tab
 Locate mod errors = 
@@ -825,20 +831,13 @@ Uniques updated! =
 ## Debug tab
 Debug = 
 
-## Unsorted - please help us sort these!
-
-Turns between autosaves = 
+## Unused - kept for future use
 Show = 
 Hide = 
-
-off = 
-
-Max zoom out = 
 HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = 
-Enable portrait orientation = 
-
 You need to restart the game for this change to take effect. = 
 
+
 # Notifications
 
 Research of [technologyName] has completed! = 
@@ -1675,6 +1674,7 @@ Requires =
 Enable out-of-game turn notifications = 
 Out-of-game, update status of all games every: = 
 Show persistent notification for turn notifier service = 
+# These are on Options-Advanced
 Take user ID from clipboard = 
 Doing this will reset your current user ID to the clipboard contents - are you sure? = 
 ID successfully set! = 
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 158c7c1c93..0bf6230fbc 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,8 +4,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.8.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 879
-    const val appVersion = "4.7.0-patch1"
+    const val appCodeNumber = 880
+    const val appVersion = "4.7.1"
 
     const val gdxVersion = "1.11.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index 277bf82857..282b502f17 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,25 @@
+## 4.7.1
+
+AI prioritizes its path to buying highly desirable tiles
+
+AI prioritizes work boats, and creates work boats for close non-contiguous cities
+
+Workers try to build roads utilizing existing roads, and railroads overriding existing roads
+
+UnitFilter also matches TechFilter for that unit
+
+4.7.0-patch1
+
+Revert "Make ExpanderTab "expand" properly "
+
+By SomeTroglodyte:
+- Improve Alert Popup scrolling 
+- Make mod categories curated in Json 
+- Scene2D debug tool 
+- Fix vulnerability of new NationPickerPopup icon view 
+- Long press support 
+- Keyboard bindings - collision check 
+
 ## 4.7.0
 
 AI:
diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
index b0e267e444..41bbf092d8 100644
--- a/core/src/com/unciv/UncivGame.kt
+++ b/core/src/com/unciv/UncivGame.kt
@@ -533,7 +533,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
 
     companion object {
         //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
-        val VERSION = Version("4.7.0-patch1", 879)
+        val VERSION = Version("4.7.1", 880)
         //endregion
 
         lateinit var Current: UncivGame
diff --git a/fastlane/metadata/android/en-US/changelogs/880.txt b/fastlane/metadata/android/en-US/changelogs/880.txt
new file mode 100644
index 0000000000..20fe353274
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/880.txt
@@ -0,0 +1,21 @@
+
+
+AI prioritizes its path to buying highly desirable tiles
+
+AI prioritizes work boats, and creates work boats for close non-contiguous cities
+
+Workers try to build roads utilizing existing roads, and railroads overriding existing roads
+
+UnitFilter also matches TechFilter for that unit
+
+4.7.0-patch1
+
+Revert "Make ExpanderTab "expand" properly "
+
+By SomeTroglodyte:
+- Improve Alert Popup scrolling 
+- Make mod categories curated in Json 
+- Scene2D debug tool 
+- Fix vulnerability of new NationPickerPopup icon view 
+- Long press support 
+- Keyboard bindings - collision check 
\ No newline at end of file