diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index eef5f15ab8..3ea4f79cf0 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -643,7 +643,7 @@ Insufficient permissions to delete [saveFileName]. = Permissions insuffisantes p
 Failed to delete [saveFileName]. = La suppression de [saveFileName] a échoué.
 Saved at = Enregistré le
 Saving... = Sauvegarde en cours...
-Overwrite existing file? = Écraser les fichiers existants?
+Overwrite existing file? = Écraser le fichier existant ?
 Overwrite = Écraser
 It looks like your saved game can't be loaded! = Il semble que votre sauvegarde ne puisse pas être chargée !
 If you could copy your game data ("Copy saved game to clipboard" -  = Si vous pouvez, copiez votre sauvegarde ("Copier la sauvegarde dans le presse-papier" - 
@@ -1015,7 +1015,7 @@ Pick improvement = Choisir un aménagement
 Provides [resource] = Fournit [resource]
 Provides [amount] [resource] = Fournit [amount] [resource]
 Replaces [improvement] = Remplace [improvement]
-Pick now! = Choisir maintenant !
+Pick now! = Choisir !
 Remove [feature] first = Supprimer [feature] au préalable
 Research [tech] first = Rechercher [tech] au préalable
 Have this tile close to your borders = Avoir cette case près de vos frontières
@@ -1329,7 +1329,7 @@ Missing translations: = Traductions manquantes :
 Resolution = Résolution
 Tileset = Style des cases
  # Requires translation!
-Unitset = 
+Unitset = Style des unités
 UI Skin = Style de l'interface
 Create = Créer
 Language = Langue
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 35849509ec..97c5c14450 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -1328,8 +1328,7 @@ for = für
 Missing translations: = Fehlende Übersetzungen:
 Resolution = Auflösung
 Tileset = Feldgrafik-Satz
- # Requires translation!
-Unitset = 
+Unitset = Einheitengrafik-Satz
 UI Skin = Aussehen der Benutzeroberfläche
 Create = Erstellen
 Language = Sprache
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index 4964705160..ee1eed28ce 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -106,8 +106,8 @@ Pick a construction = Elige construcción
 Queue empty = Lista vacía
 Add to queue = Añadir a la lista
 Remove from queue = Eliminar de la lista
-Show stats drilldown = Mostrar desglose de atributos
-Show construction queue = Mostrar lista de construcción
+Show stats drilldown = Mostrar Desglose Estadístico
+Show construction queue = Mostrar Lista de Construcción
 No space to place this unit = No hay espacio para colocar esta unidad
 Cancel = Cancelar
 
@@ -684,25 +684,25 @@ Downloading... = Descargando...
 Could not download music! = ¡No se pudo descargar la música!
 Show = Mostrar
 Hide = Ocultar
-Show worked tiles = Mostrar casillas trabajadas
-Show resources and improvements = Mostrar recursos y mejoras
-Check for idle units = Comprobar unidades sin utilizar
-Move units with a single tap = Mover unidades con un solo toque
-Show tutorials = Mostrar tutoriales
-Auto-assign city production = Construcción automática en las ciudades
+Show worked tiles = Mostrar Casillas Trabajadas
+Show resources and improvements = Mostrar Iconos de Recursos y Mejoras
+Check for idle units = Comprobar Unidades sin Utilizar
+Move units with a single tap = Mover Unidades con un solo toque
+Show tutorials = Mostrar Tutoriales
+Auto-assign city production = Construcción Automática en las Ciudades
 Auto-build roads = Construir carreteras autom.
-Automated workers replace improvements = Los trabajadores autom. reemplazan mejoras
+Automated workers replace improvements = Los Trabajadores autom. Reemplazan Mejoras
 Minimap size = Tamaño del Minimapa
 off = oculto
-Show pixel units = Mostrar modelos de las unidades
-Show pixel improvements = Mostrar modelos de las mejoras
+Show pixel units = Mostrar Modelos de las Unidades
+Show pixel improvements = Mostrar Modelos de las Mejoras
 Enable Nuclear Weapons = Permitir Armas Nucleares
 Experimental Demographics scoreboard = Tabla de puntaje Demográfica - Experimental
 Unit icon opacity = Transparencia de los iconos de Unidad
-Show zoom buttons in world screen = Mostrar botones para zoom del mapa
+Show zoom buttons in world screen = Mostrar Botones para Zoom del Mapa
 Enable display cutout (requires restart) = Permitir ajuste total a la pantalla (requiere reinicio)
-Show tile yields = Mostrar rendimientos de casilla
-Show unit movement arrows = Mostrar flechas de acción de unidad
+Show tile yields = Mostrar Rendimientos de Casilla
+Show unit movement arrows = Mostrar Flechas de Acción
 Continuous rendering = Renderizado Continuo
 When disabled, saves battery life but certain animations will be suspended = Cuando está deshabilitado ahorra batería, pero se desactivan ciertas animaciones
 Order trade offers by amount = Ordenar ofertas comerciales por cantidad
@@ -717,8 +717,8 @@ Autoupdate mod uniques = Actualizar automáticamente los uniques de mods
 Uniques updated! = ¡Uniques actualizados!
 
 Max zoom out = Alejado de cámara máximo 
-Show experimental world wrap for maps = Mostrar mapa envolvente experimental
-HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = MUY EXPERIMENTAL, ¡QUEDAS AVISADO!
+Show experimental world wrap for maps = Mostrar Opción de Mapa Envolvente experimental
+HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = Experimental, ¡Quedas Avisado!
 Enable portrait orientation = Permitir orientación vertical
 Generate translation files = Generar archivos de traducción
 Translation files are generated successfully. = Archivos de traducción generados correctamente.
@@ -1327,9 +1327,8 @@ Movement cost = Coste de movimiento
 for = para
 Missing translations: = Traducciones faltantes:
 Resolution = Resolución
-Tileset = Aspecto de casillas
- # Requires translation!
-Unitset = 
+Tileset = Aspecto de Casillas
+Unitset = Aspecto de Unidades
 UI Skin = Aspecto de la IU
 Create = Crear
 Language = Idioma
@@ -1492,7 +1491,7 @@ Requires = Requiere
 
 Enable out-of-game turn notifications = Habilitar notificaciones de turno fuera del juego
 Out-of-game, update status of all games every: = Cuando afuera del juego, actualizar todas las partidas cada:
-Show persistent notification for turn notifier service = Mostrar notificación persistente para la notificación de turno
+Show persistent notification for turn notifier service = Mostrar notificación persistente para aviso de turno
 Take user ID from clipboard = Tomar el ID de usuario del portapapeles
 Doing this will reset your current user ID to the clipboard contents - are you sure? = Está acción remplazará tu ID de usuario actual por el contenido en el portapapeles, ¿estás seguro?
 ID successfully set! = ¡ID asignado con éxito!
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index b10acf1ff3..f94c6a79ac 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.7.0"
     const val appName = "Unciv"
-    const val appCodeNumber = 764
-    const val appVersion = "4.2.20"
+    const val appCodeNumber = 765
+    const val appVersion = "4.2.21"
 
     const val gdxVersion = "1.11.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index 5e4da711e0..e52ad37eec 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,15 @@
+## 4.2.21
+
+Resolved  - units now recieve correct healing in friendly territory
+
+Tile info table no longer reveals hidden units - see 
+
+Resolved  - AI no longer nukes if as consequence it will mean declaring war on someone
+
+Resolved  - empire overview screen updates after changing info in city screen
+
+Resolved  - fixed civilopedia text that says city-states don't conquer other cities
+
 ## 4.2.20
 
 Main map and mini-map no longer show unexplored tiles!
diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
index d39e9d3c49..23a53c34f1 100644
--- a/core/src/com/unciv/UncivGame.kt
+++ b/core/src/com/unciv/UncivGame.kt
@@ -470,7 +470,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
 
     companion object {
         //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
-        val VERSION = Version("4.2.20", 764)
+        val VERSION = Version("4.2.21", 765)
         //endregion
 
         lateinit var Current: UncivGame
diff --git a/fastlane/metadata/android/en-US/changelogs/765.txt b/fastlane/metadata/android/en-US/changelogs/765.txt
new file mode 100644
index 0000000000..8373b7adea
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/765.txt
@@ -0,0 +1,11 @@
+
+
+Resolved  - units now recieve correct healing in friendly territory
+
+Tile info table no longer reveals hidden units - see 
+
+Resolved  - AI no longer nukes if as consequence it will mean declaring war on someone
+
+Resolved  - empire overview screen updates after changing info in city screen
+
+Resolved  - fixed civilopedia text that says city-states don't conquer other cities
\ No newline at end of file