diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index 000f8393e8..c2d27194d5 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -971,22 +971,16 @@ Avoid [terrain] =
 
 # Maya calendar popup
 
- # Requires translation!
-The Mayan Long Count = 
- # Requires translation!
-Your scientists and theologians have devised a systematic approach to measuring long time spans - the Long Count. During the festivities whenever the current b'ak'tun ends, a Great Person will join you. = 
- # Requires translation!
-While the rest of the world calls the current year [year], in the Maya Calendar that is: = 
- # Requires translation!
-[amount] b'ak'tun, [amount2] k'atun, [amount3] tun = 
+The Mayan Long Count = Ang Mahabang Pagbibilang ng mga Mayan
+Your scientists and theologians have devised a systematic approach to measuring long time spans - the Long Count. During the festivities whenever the current b'ak'tun ends, a Great Person will join you. = Ang iyong mga siyentipiko at teologo ay gumawa ng isang sistematikong diskarte sa pagsukat ng mahabang panahon - ang Mahabang Pagbibilang. Sa panahon ng kasiyahan sa tuwing matatapos ang kasalukuyang b'ak'tun, sasamahan ka ng isang Dakilang Tao.
+While the rest of the world calls the current year [year], in the Maya Calendar that is: = Habang ang ibang bahagi ng mundo ay tinatawag ang kasalukuyang taon na [year], sa Kalendaryong Maya ay:
+[amount] b'ak'tun, [amount2] k'atun, [amount3] tun = [amount] b'ak'tun, [amount2] k'atun, [amount3] tun
 
 # City screen
 
 Exit city = Lumabas sa lungsod
- # Requires translation!
-Raze city = 
- # Requires translation!
-Stop razing city = 
+Raze city = Wasakin ang lungsod
+Stop razing city = Itigil ang pagwasak sa lungsod
 Buy for [amount] gold = Bumili para sa [amount] ng ginto
 Buy = Ibili
 Currently you have [amount] [stat]. = Sa kasalukuyan mayroon kang [amount] [stat].
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 372a197959..65ec31477b 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -484,7 +484,7 @@ Change map to fit selected ruleset? = Modifier la carte pour l'adapter aux règl
 Area: [amount] tiles, [amount2] continents/islands = Surface : [amount] cases, [amount2] continents/îles
 Do you want to leave without saving the recent changes? = Voulez-vous quitter sans sauvegarder les derniers changements ?
  # Requires translation!
-Do you want to load another map without saving the recent changes? = 
+Do you want to load another map without saving the recent changes? = Voulez-vous charger une autre carte sans sauvegarder les derniers changements ?
 Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = Carte invalide: la zone ([area]) ne correspond pas aux dimensions sauvegardées ([dimensions]).
 The dimensions have now been fixed for you. = Les dimensions ont été maintenant définies pour vous.
 River generation failed! = La génération des rivières a échoué !
@@ -501,7 +501,7 @@ Spawn rare features = Implémenter les caractéristiques rares
 Distribute ice = Distribuer la glace
 Assign continent IDs = Assigner les IDs des continents
  # Requires translation!
-Place Natural Wonders = 
+Place Natural Wonders = Placer les merveilles naturelles
 Let the rivers flow = Tracer les rivières
 Spread Resources = Répandre les ressources
 Create ancient ruins = Créer des ruines antiques
@@ -1156,9 +1156,9 @@ Improved by [improvement] = Aménagement requis : [improvement]
 Bonus stats for improvement = Bonus de case aménagée
 Buildings that consume this resource = Bâtiments consommant cette ressource
  # Requires translation!
-Buildings that provide this resource = 
+Buildings that provide this resource = Bâtiments fournissant cette ressource
  # Requires translation!
-Improvements that provide this resource = 
+Improvements that provide this resource = Aménagements fournissant cette ressource
 Buildings that require this resource worked near the city = Bâtiments nécessitant que cette ressource soit exploitée près de la ville
 Units that consume this resource = Unités consommant cette ressource
 Can be built on = Peut être construit sur
@@ -4432,7 +4432,7 @@ The world has been convulsed by war. Many great and powerful civilizations have
 
 Do things to win! = Faites ceci pour gagner !
  # Requires translation!
-Anyone should build [buildingFilter] = 
+Anyone should build [buildingFilter] = Quiconque construit [buildingFilter]
 Win diplomatic vote = Remporter le vote diplomatique
 You have triumphed over your foes through the art of diplomacy! Your cunning and wisdom have earned you great friends - and divided and sown confusion among your enemies! Forever will you be remembered as the leader who brought peace to this weary world! = Vous avez triomphé de vos adversaires par l'art de la diplomatie ! Votre sagacité et votre sagesse ont permis d'instaurer des amitiés durables - mais aussi de diviser et semer la confusion chez vos ennemis ! Pour des éons, on se souviendra de vous comme le dirigeant ayant apporté la paix dans ce monde troublé !
 
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 829d1b2dff..a3e49287b2 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -483,8 +483,7 @@ Continent: [param] ([amount] tiles) = Kontinent: [param] ([amount] Felder)
 Change map to fit selected ruleset? = Karte ändern, um sie dem neuen Regelsatz anzupassen?
 Area: [amount] tiles, [amount2] continents/islands = Fläche: [amount] Felder, [amount2] Kontinente/Inseln
 Do you want to leave without saving the recent changes? = Willst Du wirklich den Editor verlassen ohne die Änderungen zu speichern?
- # Requires translation!
-Do you want to load another map without saving the recent changes? = 
+Do you want to load another map without saving the recent changes? = Möchtest du eine andere Karte laden, ohne die bisherigen Änderungen zu speichern?
 Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = Ungültige Karte: Die Fläche ([area]) stimmt nicht mit den gespeicherten Abmessungen ([dimensions]) überein.
 The dimensions have now been fixed for you. = Die Abmessungen wurden für dich korrigiert.
 River generation failed! = Flüsse generieren ist fehlgeschlagen!
@@ -500,8 +499,7 @@ Sprout vegetation = Pflanzen sprießen lassen
 Spawn rare features = Außergewöhnliches Gelände
 Distribute ice = Eis verteilen
 Assign continent IDs = Kontinent-IDs zuweisen
- # Requires translation!
-Place Natural Wonders = 
+Place Natural Wonders = Platziere natürliche Wunder
 Let the rivers flow = Flüsse fließen lassen
 Spread Resources = Ressourcen verteilen
 Create ancient ruins = Ruinen verteilen
@@ -1155,10 +1153,8 @@ Can be found on = Kann gefunden werden in
 Improved by [improvement] = Wird verbessert durch [improvement]
 Bonus stats for improvement = Boni für Verbesserung
 Buildings that consume this resource = Gebäude welche diese Ressource verbrauchen
- # Requires translation!
-Buildings that provide this resource = 
- # Requires translation!
-Improvements that provide this resource = 
+Buildings that provide this resource = Gebäude die diese Ressource bereitstellen
+Improvements that provide this resource = Verbesserungen die diese Ressource bereitstellen
 Buildings that require this resource worked near the city = Gebäude welche diese Ressource bewirtschaftet in der Nähe der Stadt benötigen
 Units that consume this resource = Einheiten welche diese Ressource verbrauchen
 Can be built on = Kann gebaut werden auf
@@ -4429,8 +4425,7 @@ Destroy all enemies\nto win! = Vernichte alle Feinde\num zu gewinnen!
 The world has been convulsed by war. Many great and powerful civilizations have fallen, but you have survived - and emerged victorious! The world will long remember your glorious triumph! = Die Welt wurde vom Krieg erschüttert. Mögen große und mächtige Zivilisationen gefallen sein, aber du hast überlebt - und bist siegreich geworden! Die Welt wird sich lange an deinen glorreichen Triumph erinnern!
 
 Do things to win! = Tu Dinge um zu gewinnen!
- # Requires translation!
-Anyone should build [buildingFilter] = 
+Anyone should build [buildingFilter] = Irgendjemand sollte [buildingFilter] bauen
 Win diplomatic vote = Gewinne eine diplomatische Abstimmung
 You have triumphed over your foes through the art of diplomacy! Your cunning and wisdom have earned you great friends - and divided and sown confusion among your enemies! Forever will you be remembered as the leader who brought peace to this weary world! = Du hast durch die Kunst der Diplomatie über deine Feinde triumphiert! Deine Klugheit und Weisheit haben dir viele Freunde eingebracht - und deine Feinde gespalten und verwirrt! Für immer wird man sich an dich als den Anführer erinnern, der den Frieden in diese ermüdete Welt gebracht hat!
 
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 013a97a979..10ba86ce7c 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -15,9 +15,9 @@ StartWithCapitalLetter = true
 
 # Base ruleset names
  # Requires translation!
-Civ V - Vanilla = 
+Civ V - Vanilla = Civ V - Vanilla
  # Requires translation!
-Civ V - Gods & Kings = 
+Civ V - Gods & Kings = Civ V - Gods & Kings
 
 # Tutorial tasks
 
@@ -102,7 +102,7 @@ Research Agreement = Persetujuan Riset
 Declare war = Nyatakan perang
 Declare war on [civName]? = Nyatakan perang pada [civName]?
  # Requires translation!
-Go to on map = 
+Go to on map = Pergi ke sana di peta
 Let's begin! = Mari kita mulai!
 [civName] has declared war on us! = [civName] telah menyatakan perang pada kita!
 [leaderName] of [nation] = [leaderName] dari [nation]
@@ -209,7 +209,7 @@ Relationship changes in another [turnsToRelationshipChange] turns = Hubungan ber
 Protected by = Dilindungi oleh
 Revoke Protection = Cabut Perlindungan
  # Requires translation!
-Revoke protection for [cityStateName]? = 
+Revoke protection for [cityStateName]? = Cabut perlindungan untuk [cityStateName]?
 Pledge to protect = Buat pakta untuk melindungi
 Declare Protection of [cityStateName]? = Nyatakan Pakta Perlindungan [cityStateName]?
 Build [improvementName] on [resourceName] (200 Gold) = Bangun [improvementName] untuk [resourceName] (200 Emas)
@@ -303,7 +303,7 @@ Declare war on [nation] = Nyatakan perang pada [nation]
 Luxury resources = Barang mewah
 Strategic resources = Sumber daya strategis
  # Requires translation!
-Owned by you: [amountOwned] = 
+Owned by you: [amountOwned] = Dimiliki kamu: [amountOwned]
 
 # Nation picker
 
@@ -417,9 +417,9 @@ It looks like we can't make a map with the parameters you requested! = Sepertiny
 Maybe you put too many players into too small a map? = Mungkin Anda menaruh terlalu banyak pemain dalam peta yang terlalu kecil?
 No human players selected! = Tidak ada pemain manusia yang terpilih!
  # Requires translation!
-Invalid Player ID! = 
+Invalid Player ID! = ID Pemain tidak valid!
  # Requires translation!
-No victory conditions were selected! = 
+No victory conditions were selected! = Belum ada kondisi kemenangan yang dipilih!
 Mods: = Mod:
 Extension mods: = Mod ekstensi:
 Base ruleset: = Aturan dasar:
@@ -448,19 +448,19 @@ Anything above 40 may work very slowly on Android! = Peta di atas ukuran 40 dapa
 ## Tabs/Buttons
 Map editor = Editor peta
  # Requires translation!
-View = 
+View = Lihat
  # Requires translation!
-Generate = 
+Generate = Buat
  # Requires translation!
-Partial = 
+Partial = Sebagian
  # Requires translation!
-Generator steps = 
+Generator steps = Langkah pembuatan
  # Requires translation!
-Edit = 
+Edit = Ubah
  # Requires translation!
-Rivers = 
+Rivers = Sungai
  # Requires translation!
-Load = 
+Load = Muat
 Save = Simpan
 New map = Peta baru
 Empty = Kosongkan
@@ -469,108 +469,108 @@ Load map = Muat peta
 Delete map = Hapus peta
 Are you sure you want to delete this map? = Apakah Anda yakin ingin menghapus peta ini?
  # Requires translation!
-It looks like your map can't be saved! = 
+It looks like your map can't be saved! = Sepertinya peta Anda tidak dapat disimpan!
 Exit map editor = Keluar dari editor peta
  # Requires translation!
-Change map ruleset = 
+Change map ruleset = Ubah aturan dasar
  # Requires translation!
-Change the map to use the ruleset selected on this page = 
+Change the map to use the ruleset selected on this page = Ubah peta sehingga menggunakan aturan dasar yang dipilih pada halaman ini
  # Requires translation!
-Revert to map ruleset = 
+Revert to map ruleset = Kembalikan aturan dasar peta
  # Requires translation!
-Reset the controls to reflect the current map ruleset = 
+Reset the controls to reflect the current map ruleset = Atur ulang kontrol-kontrol untuk merefleksikan aturan dasar peta ini
  # Requires translation!
-Features = 
+Features = Fitur
  # Requires translation!
-Starting locations = 
+Starting locations = Tempat mulai
  # Requires translation!
-Tile Matching Criteria = 
+Tile Matching Criteria = Kriteria Pencocokan Daerah
  # Requires translation!
-Complete match = 
+Complete match = Cocok sempurna
  # Requires translation!
-Except improvements = 
+Except improvements = Kecuali peningkatan
  # Requires translation!
-Base and terrain features = 
+Base and terrain features = Fitur dasar dan medan
  # Requires translation!
-Base terrain only = 
+Base terrain only = Medan dasar saja
  # Requires translation!
-Land or water only = 
+Land or water only = Darat atau air saja
 
 ## Labels/messages
  # Requires translation!
-Brush ([size]): = 
+Brush ([size]): = Kuas ([size]):
 # The letter shown in the [size] parameter above for setting "Floodfill"
  # Requires translation!
-F = 
+F = I
 Error loading map! = Pemuatan peta tidak berhasil!
  # Requires translation!
-Map saved successfully! = 
+Map saved successfully! = Peta berhasil tersimpan!
  # Requires translation!
-Current map RNG seed: [amount] = 
+Current map RNG seed: [amount] = RNG benih peta ini: [amount]
  # Requires translation!
-Map copy and paste = 
+Map copy and paste = Salin dan tempel peta
  # Requires translation!
-Position: [param] = 
+Position: [param] = Posisi: [param]
  # Requires translation!
-Starting location(s): [param] = 
+Starting location(s): [param] = Tempat mulai: [param]
  # Requires translation!
-Continent: [param] ([amount] tiles) = 
+Continent: [param] ([amount] tiles) = Benua: [param] ([amount] daerah)
 Change map to fit selected ruleset? = Ubah peta supaya sesuai dengan set peraturan?
  # Requires translation!
-Area: [amount] tiles, [amount2] continents/islands = 
+Area: [amount] tiles, [amount2] continents/islands = Area: [amount] daerah, [amount2] benua/pulau
  # Requires translation!
-Do you want to leave without saving the recent changes? = 
+Do you want to leave without saving the recent changes? = Apakah Anda ingin keluar tanpa menyimpan perubahan terkini?
  # Requires translation!
-Do you want to load another map without saving the recent changes? = 
+Do you want to load another map without saving the recent changes? = Apakah Anda ingin memuat peta lain tanpa menyimpan perubahan terkini?
 Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = Peta tidak valid: Area ([area]) tidak sesuai dengan dimensi yang disimpan ([dimensions]).
 The dimensions have now been fixed for you. = Dimensinya sudah diperbaiki untukmu.
  # Requires translation!
-River generation failed! = 
+River generation failed! = Pembuatan sungai gagal!
  # Requires translation!
-Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = 
+Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = Jangan menggunakan langkah 'Daratan' dengan jenis peta 'Kosong', sebagai gantinya, buatlah peta kosong baru.
 
 ## Map/Tool names
  # Requires translation!
-My new map = 
+My new map = Peta baru saya
  # Requires translation!
-Generate landmass = 
+Generate landmass = Buat daratan
  # Requires translation!
-Raise mountains and hills = 
+Raise mountains and hills = Buat pegunungan dan perbukitan
  # Requires translation!
-Humidity and temperature = 
+Humidity and temperature = Kelembapan dan suhu
  # Requires translation!
-Lakes and coastline = 
+Lakes and coastline = Danau dan pantai
  # Requires translation!
-Sprout vegetation = 
+Sprout vegetation = Tumbuhkan vegetasi
  # Requires translation!
-Spawn rare features = 
+Spawn rare features = Munculkan fitur-fitur langka
  # Requires translation!
-Distribute ice = 
+Distribute ice = Sebarkan es
  # Requires translation!
-Assign continent IDs = 
+Assign continent IDs = Tetapkan ID benua
  # Requires translation!
-Place Natural Wonders = 
+Place Natural Wonders = Tempatkan Keajaiban Alam
  # Requires translation!
-Let the rivers flow = 
+Let the rivers flow = Alirkan sungai
  # Requires translation!
-Spread Resources = 
+Spread Resources = Sebarkan Sumber Daya
  # Requires translation!
-Create ancient ruins = 
+Create ancient ruins = Buat reruntuhan kuno
  # Requires translation!
-Floodfill = 
+Floodfill = Isi Banjir
 [nation] starting location = Lokasi memulai [nation]
  # Requires translation!
-Remove features = 
+Remove features = Hapus fitur
  # Requires translation!
-Remove improvement = 
+Remove improvement = Hapus peningkatan
  # Requires translation!
-Remove resource = 
+Remove resource = Hapus sumber daya
  # Requires translation!
-Remove starting locations = 
+Remove starting locations = Hapus tempat mulai
  # Requires translation!
-Remove rivers = 
+Remove rivers = Hapus sungai
  # Requires translation!
-Spawn river from/to = 
+Spawn river from/to = Timbulkan sungai dari/ke
 Bottom left river = Sungai kiri bawah
 Bottom right river = Sungai kanan bawah
 Bottom river = Sungai bawah
@@ -721,7 +721,7 @@ We have encountered [civName]! = Kita telah menemukan bangsa [civName]!
 [cityStateName] has given us [stats] as we are the first major civ to meet them = [cityStateName] telah memberikan [stats] karena kita adalah peradaban besar pertama yang bertemu dengan mereka
 [cityStateName] has also given us [stats] = [cityStateName] juga telah memberikan kita [stats]
  # Requires translation!
-[cityStateName] gave us a [unitName] as a gift! = 
+[cityStateName] gave us a [unitName] as a gift! = [cityStateName] memberikan [unitName] sebagai hadiah!
 Cannot provide unit upkeep for [unitName] - unit has been disbanded! = Tidak dapat menyediakan persediaan untuk [unitName] - unit dibubarkan
 [cityName] has grown! = [cityName] telah tumbuh
 [cityName] is starving! = [cityName] sedang kelaparan!
@@ -1060,7 +1060,7 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA
 Hurry Wonder = Percepat Keajaiban Dunia
 Hurry Construction = Percepat Pembangunan
  # Requires translation!
-Hurry Construction (+[productionAmount]⚙) = 
+Hurry Construction (+[productionAmount]⚙) = Percepat Pembangunan (+[productionAmount]⚙)
 Spread Religion = Sebarkan Agama
 Spread [religionName] = Sebarkan [religionName]
 Remove Heresy = Singkirkan Bidah
@@ -1079,9 +1079,9 @@ Stats = Statistik
 Policies = Kebijakan
 Base happiness = Kebahagiaan dasar
  # Requires translation!
-Traded Luxuries = 
+Traded Luxuries = Barang-barang Mewah Hasil Perdagangan
  # Requires translation!
-City-State Luxuries = 
+City-State Luxuries = Barang-barang Mewah Negara-Kota
 Occupied City = Kota yang Diduduki
 Buildings = Bangunan
 Wonders = Keajaiban Dunia
@@ -1110,7 +1110,7 @@ Name = Nama
 Closest city = Kota terdekat
 Action = Aksi
  # Requires translation!
-Upgrade = 
+Upgrade = Tingkatkan
 Defeated = Dikalahkan
 [numberOfCivs] Civilizations in the game = [numberOfCivs] Peradaban di dalam game
 Our Civilization: = Peradaban kita:
@@ -1141,26 +1141,26 @@ Number of your cities\ndemanding this resource for\n'We Love The King Day' = Jum
 # Victory
 
  # Requires translation!
-[victoryType] Victory = 
+[victoryType] Victory = Kemenangan [victoryType]
  # Requires translation!
-Built [building] = 
+Built [building] = Membangun [building]
  # Requires translation!
-Add all spaceship parts in capital = 
+Add all spaceship parts in capital = Tambahkan semua bagian pesawat antariksa di ibu kota
  # Requires translation!
-Destroy all players = 
+Destroy all players = Hancurkan semua pemain
  # Requires translation!
-Capture all capitals = 
+Capture all capitals = Duduki semua ibu kota
  # Requires translation!
-Complete [amount] Policy branches = 
+Complete [amount] Policy branches = Lengkapi [amount] cabang Kebijakan
 You have won a [victoryType] Victory! = Anda telah mendapatkan kemenangan [victoryType]!
  # Requires translation!
-[civilization] has won a [victoryType] Victory! = 
+[civilization] has won a [victoryType] Victory! = [civilization] telah memenangkan [victoryType] Victory!
 Your civilization stands above all others! The exploits of your people shall be remembered until the end of civilization itself! = Peradabanmu berdiri melampaui semua peradaban lainnya! Usaha rakyatmu akan dikenang hingga berakhirnya peradaban ini!
 You have been defeated. Your civilization has been overwhelmed by its many foes. But your people do not despair, for they know that one day you shall return - and lead them forward to victory! = Anda telah dikalahkan. Peradaban Anda kewalahan menangani musuhnya yang banyak. Tetapi rakyatmu tidak putus asa, karena mereka tahu bahwa suatu hari Anda akan kembali - dan membawa mereka menuju kemenangan!
 One more turn...! = Satu giliran lagi...!
-Destroy [civName] = [civName] Dihancurkan
+Destroy [civName] = Hancurkan [civName] 
  # Requires translation!
-Capture [cityName] = 
+Capture [cityName] = Duduki [cityName]
 Our status = Status kita
 Global status = Status global
 Rankings = Peringkat
@@ -1227,9 +1227,9 @@ Improved by [improvement] = Ditingkatkan dengan [improvement]
 Bonus stats for improvement = Bonus statistik untuk peningkatan
 Buildings that consume this resource = Bangunan yang menggunakan sumber daya ini
  # Requires translation!
-Buildings that provide this resource = 
+Buildings that provide this resource = Bangunan yang menyediakan sumber daya ini
  # Requires translation!
-Improvements that provide this resource = 
+Improvements that provide this resource = Peningkatan yang menyediakan sumber daya ini
 Buildings that require this resource worked near the city = Bangunan yang membutuhkan sumber daya ini dikerjakan di sekitar kota
 Units that consume this resource = Unit yang menggunakan sumber daya ini
 Can be built on = Dapat dibangun di
@@ -1291,7 +1291,7 @@ Granted by: = Diberikan oleh:
 [bonus] with [tech] = [bonus] dengan [tech]
 Difficulty levels = Tingkat kesulitan
  # Requires translation!
-The possible rewards are: = 
+The possible rewards are: = Kemungkinan hadiahnya adalah:
 
 # Policies
 
@@ -1321,7 +1321,7 @@ Majority Religion: [name] = Agama Mayoritas: [name]
 + [amount] pressure = + [amount] tekanan
 Holy city of: [religionName] = Kota suci agama: [religionName]
  # Requires translation!
-Followers = 
+Followers = Pengikut
 Pressure = Tekanan
 
 # Religion overview screen
@@ -1501,7 +1501,7 @@ Air = Udara
 non-air = non-udara
 Nuclear Weapon = Senjata Nuklir
  # Requires translation!
-Great Person = 
+Great Person = Orang Hebat
 Barbarian = Orang Barbar
 relevant = relevan
 City = Kota
@@ -1578,7 +1578,7 @@ enhancing = memperkuat
 ######### Religious Action Filters ###########
 
  # Requires translation!
-Remove Foreign religions from your own cities = 
+Remove Foreign religions from your own cities = Singkirkan agama Pendatang dari kota-kotamu
 
 ######### Unique Specials ###########
 
@@ -3252,7 +3252,7 @@ Ringsted = Ringsted
 Skrive = Skrive
 Denmark = Denmark
  # Requires translation!
-[amount] Movement point cost to disembark = 
+[amount] Movement point cost to disembark = [amount] biaya poin Pergerakan untuk mendarat
 No movement cost to pillage = Tidak memakai biaya pergerakan untuk menjarah
 
 You leave us no choice. War it must be. = Kamu membuat kami tidak punya pilihan lain. Perang harus terjadi.
@@ -3485,7 +3485,7 @@ Socialism = Sosialisme
 [relativeAmount]% maintenance cost for buildings [cityFilter] = [relativeAmount]% biaya pemeliharaan untuk bangunan-bangunan [cityFilter]
 Communism = Komunisme
  # Requires translation!
-[amount]% [stat] when constructing [unitType] buildings [cityFilter] = 
+[amount]% [stat] when constructing [unitType] buildings [cityFilter] = [amount]% [stat] saat membangun bangunan [unitType] [cityFilter]
 Order Complete = Ketertiban Lengkap
 Order = Ketertiban
 
@@ -4496,29 +4496,29 @@ SS Stasis Chamber = Ruang Stasis PA
 #################### Lines from VictoryTypes from Civ V - Vanilla ####################
 
  # Requires translation!
-Complete all the spaceship parts\nto win! = 
+Complete all the spaceship parts\nto win! = Selesaikan semua bagian pesawat antariksa\nuntuk menang!
  # Requires translation!
-Add all [param] in capital = 
+Add all [param] in capital = Tambahkan semua [param] di ibu kota
 You have achieved victory through mastery of Science! You have conquered the mysteries of nature and led your people on a voyage to a brave new world! Your triumph will be remembered as long as the stars burn in the night sky! = Anda telah menang melalui penguasaan ilmu pengetahuan! Anda telah mengungkapkan misteri-misteri alam dan memimpin peradaban Anda dalam perjalanan ke dunia yang baru! Kemenangan Anda akan dikenang selama bintang-bintang di langit tetap bersinar!
 
  # Requires translation!
-Complete 5 policy branches and\nbuild the Utopia Project to win! = 
+Complete 5 policy branches and\nbuild the Utopia Project to win! = Lengkapi 5 cabang kebijakan dan\nbangun Proyek Utopia untuk menang!
 You have achieved victory through the awesome power of your Culture. Your civilization's greatness - the magnificence of its monuments and the power of its artists - have astounded the world! Poets will honor you as long as beauty brings gladness to a weary heart. = Anda telah mencapai kemenangan melalui kebudayaan Anda yang mengagumkan. Kemegahan peradaban Anda - keagungan monumen-monumen dan kemampuan para seniman Anda- telah mengguncangkan dunia!
 
  # Requires translation!
-Destroy all enemies\nto win! = 
+Destroy all enemies\nto win! = Hancurkan semua musuh\nuntuk menang!
 The world has been convulsed by war. Many great and powerful civilizations have fallen, but you have survived - and emerged victorious! The world will long remember your glorious triumph! = Dunia telah diguncang oleh peperangan. Banyak peradaban besar dan kuat telah jatuh, tetapi Anda bertahan - dan keluar sebagai pemenang! Dunia akan mengingat kemenangan Anda!
 
  # Requires translation!
-Do things to win! = 
+Do things to win! = Lakukan sesuatu untuk menang!
  # Requires translation!
-Anyone should build [buildingFilter] = 
+Anyone should build [buildingFilter] = Siapapun harus membangun [buildingFilter]
  # Requires translation!
-Win diplomatic vote = 
+Win diplomatic vote = Menangkan pemilihan diplomatis
 You have triumphed over your foes through the art of diplomacy! Your cunning and wisdom have earned you great friends - and divided and sown confusion among your enemies! Forever will you be remembered as the leader who brought peace to this weary world! = Anda telah menang melawan musuh-musuhmu melalui jalur diplomasi! Kecerdikan dan kebijaksanaanmu telah memberikanmu teman-teman baru - dan juga memecah-belah dan menyebar kekacauan di antara musuh-musuhmu! Anda akan diingat selamanya sebagai pemimpin yang membawa kedamaian kepada dunia yang telah jemu ini!
 
  # Requires translation!
-Have highest score after max turns = 
+Have highest score after max turns = Miliki skor tertinggi setelah giliran maksimal
 
 
 #################### Lines from Beliefs from Civ V - Gods & Kings ####################
@@ -5537,9 +5537,9 @@ When founding a city, it won't follow a religion immediately. = Saat mendirikan
 The religion a city follows depends on the total pressure each religion has within the city. = Agama yang kota itu ikuti tergantung kepada tekanan total dari setiap agama kepada kota tersebut.
 Followers are allocated in the same proportions as these pressures, and these followers can be viewed in the city screen. = Pengikut dialokasi dengan proporsi yang sama dengan tekanan-tekanan ini, dan jumlah pengikut-pengikut ini dapat dilihat pada layar kota.
  # Requires translation!
-You are allowed to check religious followers and pressures in cities you do not own by selecting them. = 
+You are allowed to check religious followers and pressures in cities you do not own by selecting them. = Kamu diperbolehkan untuk mengecek jumlah pengikut dan tekanan agama di kota-kota yang bukan kepunyaanmu dengan memilih mereka.
  # Requires translation!
-In both places, a tap/click on the icon of a religion will show detailed information with its effects. = 
+In both places, a tap/click on the icon of a religion will show detailed information with its effects. = Untuk keduanya, informasi detail beserta pengaruhnya dapat ditampilkan dengan mengetuk/mengeklik ikon dari sebuah agama.
 Based on this, you can get a feel for which religions have a lot of pressure built up in the city, and which have almost none. = Berdasarkan hal ini, kamu bisa mengetahui agama mana yang memiliki banyak tekanan yang terakumulasi di suatu kota, dan mana yang hampir tidak memiliki tekanan apapun.
 The city follows a religion if a majority of its population follows that religion, and will only then receive the effects of Follower and Pantheon beliefs of that religion. = Kota mengikuti sebuah agama jika mayoritas populasinya mengikuti agama tersebut, dan hanya setelah itu akan menerima pengaruh dari Kepercayaan Biasa dan Kepercayaan Pengikut dari agama tersebut.
 
@@ -5607,11 +5607,11 @@ Requires a [buildingName] in at least [amount] cities = Memerlukan [buildingName
 Must not be next to [terrainFilter] = Tidak boleh di sebelah [terrainFilter]
 No defensive terrain penalty = Tidak mendapat penalti medan defensif
  # Requires translation!
-May attack when embarked = 
+May attack when embarked = Dapat menyerang saat melaut
 No Sight = Tidak Ada Penglihatan
 [amount] XP gained from combat = [amount] XP dari pertarungan
  # Requires translation!
-[amount] Movement point cost to embark = 
+[amount] Movement point cost to embark = [amount] biaya poin Pergerakan untuk melaut
 Irremovable = Tidak dapat disingkirkan
 by consuming this unit = dengan mengonsumsi unit ini
 when at war = saat sedang berperang
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index c9ff273522..fdac047642 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -485,8 +485,7 @@ Continent: [param] ([amount] tiles) = Continente: [param] ([amount] caselle)
 Change map to fit selected ruleset? = Vuoi cambiare mappa per il ruleset specifico?
 Area: [amount] tiles, [amount2] continents/islands = Area: [amount] caselle, [amount2] continenti/isole
 Do you want to leave without saving the recent changes? = Vuoi uscire senza salvare gli ultimi cambiamenti?
- # Requires translation!
-Do you want to load another map without saving the recent changes? = 
+Do you want to load another map without saving the recent changes? = Vuoi caricare un'altra mappa senza salvare i cambiamenti recenti?
 Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = Mappa non valida: l'area ([area]) non è uguale alle dimensioni salvate ([dimensions]).
 The dimensions have now been fixed for you. = Abbiamo aggiustato le dimensioni per te.
 River generation failed! = Generazione mappa non riuscita!
@@ -502,8 +501,7 @@ Sprout vegetation = Semina vegetazione
 Spawn rare features = Attiva caratteristiche rare
 Distribute ice = Distribuisci ghiacciai
 Assign continent IDs = Assegna ID continenti
- # Requires translation!
-Place Natural Wonders = 
+Place Natural Wonders = Piazza Meraviglie Naturali
 Let the rivers flow = Fai scorrere i fiumi
 Spread Resources = Diffondi le risorse
 Create ancient ruins = Crea antiche rovine
@@ -1158,10 +1156,8 @@ Can be found on = Può trovarsi su
 Improved by [improvement] = Può essere migliorato/a da [improvement]
 Bonus stats for improvement = Bonus per miglioramento
 Buildings that consume this resource = Edifici che consumano questa risorsa
- # Requires translation!
-Buildings that provide this resource = 
- # Requires translation!
-Improvements that provide this resource = 
+Buildings that provide this resource = Edifici che producono questa risorsa
+Improvements that provide this resource = Miglioramenti che producono questa risorsa
 Buildings that require this resource worked near the city = Edifici che richiedono la risorsa sfruttata vicino alla città
 Units that consume this resource = Unità che consumano questa risorsa
 Can be built on = Può essere costruito/a su
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 5079ca97bc..9d45105e81 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -441,7 +441,7 @@ Anything above 40 may work very slowly on Android! = 创建六边形世界地图
 ## Tabs/Buttons
 Map editor = 地图编辑器
 View = 信息
-Generate = 整体生成
+Generate = 生成
 Partial = 魔法棒
 Generator steps = 法术
 Edit = 编辑
@@ -456,8 +456,8 @@ Delete map = 删除地图
 Are you sure you want to delete this map? = 您真想删除这张地图吗？
 It looks like your map can't be saved! = 地图保存失败！
 Exit map editor = 退出地图编辑器
-Change map ruleset = 更改规则集（更多的需下载mod）
-Change the map to use the ruleset selected on this page = 使用该规则集需更改地图
+Change map ruleset = 更改规则集（想要更多需下载mod）
+Change the map to use the ruleset selected on this page = 确定更改
 Revert to map ruleset = 重置至地图规则集
 Reset the controls to reflect the current map ruleset = 将所有控制面板中的图标刷新来反映当前地图的规则集
 Features = 地形
@@ -472,7 +472,7 @@ Land or water only = 仅检查陆地还是水上
 ## Labels/messages
 Brush ([size]): = 刷子大小([size])
 # The letter shown in the [size] parameter above for setting "Floodfill"
-F = 填
+F = 赛爆
 Error loading map! = 地图加载错误！
 Map saved successfully! = 成功保存地图
 Current map RNG seed: [amount] = 当前地图种子：[amount]
@@ -483,28 +483,26 @@ Continent: [param] ([amount] tiles) = 大陆编号：[param] （[amount]格）
 Change map to fit selected ruleset? = 要更改地图以适配已选规则集吗？
 Area: [amount] tiles, [amount2] continents/islands = 当前区域：[amount]格，[amount2]座大陆/岛屿
 Do you want to leave without saving the recent changes? = 您确定要抛弃这个世界吗？您可以把它保存起来的。
- # Requires translation!
-Do you want to load another map without saving the recent changes? = 
+Do you want to load another map without saving the recent changes? = 您确定要在不保存的情况下加载另一个世界吗？
 Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = 无效的地图：区域（[area]）与尺寸（[dimensions]）不匹配。
 The dimensions have now been fixed for you. = 尺寸已为您修复。
 River generation failed! = 自动生成河流失败！
 Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = 这个世界地形已经够简单了。请先创建一个新世界。
 
 ## Map/Tool names
-My new map = 我的新世界
-Generate landmass = 万物归一（简化地形到极致）
-Raise mountains and hills = 拔地而起（生成山河山丘）
-Humidity and temperature = 生成湿度和温度（很抱歉想不出名字了）
-Lakes and coastline = 生成湖泊和海岸线（名字困难户+1）
-Sprout vegetation = 生机之绿
-Spawn rare features = 气运者的奖赏（生成稀有地貌）
-Distribute ice = 凌冬之冽（生成冰）
+My new map = 我的世界
+Generate landmass = 法·简化地形）
+Raise mountains and hills = 法·生成高山
+Humidity and temperature = 法·地形分化
+Lakes and coastline = 法 生成湖泊和海岸线
+Sprout vegetation = 法 生机之绿
+Spawn rare features = 法 生成稀有地貌
+Distribute ice = 法 凌冬之冽（生成冰）
 Assign continent IDs = 生成大洲ID（用于您造岛之后）
- # Requires translation!
-Place Natural Wonders = 
+Place Natural Wonders = 法 鬼斧神工（生成自然奇观）
 Let the rivers flow = 生成河流（名字求助）
-Spread Resources = 资源之馈
-Create ancient ruins = 先祖之智（生成远古遗迹）
+Spread Resources = 法 资源之馈
+Create ancient ruins = 法 先祖之智（生成远古遗迹）
 Floodfill = 填充刷
 [nation] starting location = [nation]起源位置
 Remove features = 移除地形
@@ -1155,11 +1153,9 @@ Can be found on = 可能发现该资源的地形地貌：
 Improved by [improvement] = 开发该资源所需设施：[improvement]
 Bonus stats for improvement = 开发该资源后设施所获奖励效果：
 Buildings that consume this resource = 消耗该资源的建筑：
- # Requires translation!
-Buildings that provide this resource = 
- # Requires translation!
-Improvements that provide this resource = 
-Buildings that require this resource worked near the city = 需要该资源在城市附近被开发的建筑
+Buildings that provide this resource = 提供该资源的建筑：
+Improvements that provide this resource = 提供该资源的区块建筑：
+Buildings that require this resource worked near the city = 需要该资源在城市周边开发的建筑：
 Units that consume this resource = 消耗该资源的单位：
 Can be built on = 可以建造于：
 or [terrainType] = 或[terrainType]
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 2cfd4bffa1..dd75c3d4e2 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.5.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 702
-    const val appVersion = "4.0.10-patch1"
+    const val appCodeNumber = 703
+    const val appVersion = "4.0.11"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index b540fa2efc..33c2a42dba 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,26 @@
+## 4.0.11
+
+Added new page with map rendering documentation
+
+Don't allow trade routes through enemy cities - 
+
+4.0.10-patch1
+
+Added placeholder parameter location in a way that enables nested translations 
+
+By JackRainy:
+- Protect the cities from the fallout spawning 
+- Correct swap of the full-loaded carriers 
+
+By SomeTroglodyte:
+- Show number of global followers in Religion Overview 
+- Map editor2.2 
+
+By xlenstra:
+- Fixed improvements with unfulfilled 'Only Available' still buildable 
+- Fixed a crash when a plane tried to enter a full city 
+- Very likely fixed a new 4.0.9 crash. 
+
 ## 4.0.10
 
 By JackRainy:
diff --git a/fastlane/metadata/android/en-US/changelogs/703.txt b/fastlane/metadata/android/en-US/changelogs/703.txt
new file mode 100644
index 0000000000..d3719ed1c1
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/703.txt
@@ -0,0 +1,23 @@
+## 4.0.11
+
+Added new page with map rendering documentation
+
+Don't allow trade routes through enemy cities - 
+
+4.0.10-patch1
+
+Added placeholder parameter location in a way that enables nested translations 
+
+By JackRainy:
+- Protect the cities from the fallout spawning 
+- Correct swap of the full-loaded carriers 
+
+By SomeTroglodyte:
+- Show number of global followers in Religion Overview 
+- Map editor2.2 
+
+By xlenstra:
+- Fixed improvements with unfulfilled 'Only Available' still buildable 
+- Fixed a crash when a plane tried to enter a full city 
+- Very likely fixed a new 4.0.9 crash. 
+