diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index 980a97fcfb..4f37198395 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -6,14 +6,14 @@ filter: MipMapLinearLinear, MipMapLinearLinear
 repeat: none
 EmojiIcons/Gold
   rotate: false
-  xy: 1560, 214
+  xy: 1250, 156
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Production
   rotate: false
-  xy: 1514, 40
+  xy: 1572, 40
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -165,6 +165,20 @@ ImprovementIcons/Quarry
   orig: 100, 100
   offset: 0, 0
   index: -1
+ImprovementIcons/Railroad
+  rotate: false
+  xy: 752, 438
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Default/Railroad
+  rotate: false
+  xy: 752, 438
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 ImprovementIcons/Road
   rotate: false
   xy: 752, 330
@@ -270,13 +284,6 @@ NationIcons/Greece
   orig: 100, 100
   offset: 0, 0
   index: -1
-NationIcons/Huns
-  rotate: false
-  xy: 4, 1641
-  size: 400, 401
-  orig: 400, 401
-  offset: 0, 0
-  index: -1
 NationIcons/Inca
   rotate: false
   xy: 717, 1086
@@ -368,6 +375,13 @@ NationIcons/Spain
   orig: 100, 100
   offset: 0, 0
   index: -1
+NationIcons/The Huns
+  rotate: false
+  xy: 4, 1641
+  size: 400, 401
+  orig: 400, 401
+  offset: 0, 0
+  index: -1
 NationIcons/The Ottomans
   rotate: false
   xy: 1508, 330
@@ -377,14 +391,14 @@ NationIcons/The Ottomans
   index: -1
 OtherIcons/Aircraft
   rotate: false
-  xy: 1816, 1748
+  xy: 1816, 1690
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/BackArrow
   rotate: false
-  xy: 220, 11
+  xy: 278, 11
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -468,7 +482,7 @@ OtherIcons/DisbandUnit
   index: -1
 OtherIcons/Down
   rotate: false
-  xy: 1270, 272
+  xy: 1328, 272
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -650,294 +664,294 @@ PolicyIcons/Aesthetics
   index: -1
 PolicyIcons/Aristocracy
   rotate: false
-  xy: 1816, 1574
+  xy: 1192, 106
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Citizenship
   rotate: false
-  xy: 626, 16
+  xy: 684, 16
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Civil Society
   rotate: false
-  xy: 684, 16
+  xy: 760, 56
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Collective Rule
   rotate: false
-  xy: 818, 56
+  xy: 876, 56
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Communism
   rotate: false
-  xy: 876, 56
+  xy: 934, 56
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Constitution
   rotate: false
-  xy: 934, 56
+  xy: 992, 56
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Cultural Diplomacy
   rotate: false
-  xy: 1050, 56
+  xy: 1108, 56
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Democracy
   rotate: false
-  xy: 1108, 56
+  xy: 1270, 272
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Educated Elite
   rotate: false
-  xy: 1386, 272
+  xy: 1444, 272
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Fascism
   rotate: false
-  xy: 1560, 272
+  xy: 1270, 214
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Free Religion
   rotate: false
-  xy: 1386, 214
+  xy: 1444, 214
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Free Speech
   rotate: false
-  xy: 1444, 214
+  xy: 1502, 214
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Free Thought
   rotate: false
-  xy: 1502, 214
+  xy: 1560, 214
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Humanism
   rotate: false
-  xy: 1424, 156
+  xy: 1482, 156
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Landed Elite
   rotate: false
-  xy: 1308, 98
+  xy: 1366, 98
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Legalism
   rotate: false
-  xy: 1366, 98
+  xy: 1424, 98
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Mandate Of Heaven
   rotate: false
-  xy: 1482, 98
+  xy: 1540, 98
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Mercantilism
   rotate: false
-  xy: 1874, 1776
+  xy: 1874, 1718
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Merchant Navy
   rotate: false
-  xy: 1874, 1718
+  xy: 1932, 1776
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Meritocracy
   rotate: false
-  xy: 1932, 1776
+  xy: 1874, 1660
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Militarism
   rotate: false
-  xy: 1874, 1660
+  xy: 1932, 1718
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Military Caste
   rotate: false
-  xy: 1932, 1718
+  xy: 1874, 1602
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Military Tradition
   rotate: false
-  xy: 1874, 1602
+  xy: 1932, 1660
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Monarchy
   rotate: false
-  xy: 1874, 1544
+  xy: 1932, 1602
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Nationalism
   rotate: false
-  xy: 1874, 1486
+  xy: 1932, 1486
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Naval Tradition
   rotate: false
-  xy: 1932, 1486
+  xy: 1166, 48
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Oligarchy
   rotate: false
-  xy: 1166, 48
+  xy: 1224, 40
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Organized Religion
   rotate: false
-  xy: 1224, 40
+  xy: 1282, 40
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Philantropy
   rotate: false
-  xy: 1282, 40
+  xy: 1340, 40
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Planned Economy
   rotate: false
-  xy: 1340, 40
+  xy: 1398, 40
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Police State
   rotate: false
-  xy: 1398, 40
+  xy: 1456, 40
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Populism
   rotate: false
-  xy: 1456, 40
+  xy: 1514, 40
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Professional Army
   rotate: false
-  xy: 1572, 40
+  xy: 1600, 1482
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Protectionism
   rotate: false
-  xy: 1600, 1482
+  xy: 1658, 1482
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Reformation
   rotate: false
-  xy: 1585, 1424
+  xy: 1585, 1366
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Representation
   rotate: false
-  xy: 1643, 1424
+  xy: 1585, 1308
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Republic
   rotate: false
-  xy: 1585, 1308
+  xy: 1643, 1366
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Scholasticism
   rotate: false
-  xy: 1643, 1366
+  xy: 1701, 1424
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Scientific Revolution
   rotate: false
-  xy: 1701, 1424
+  xy: 1585, 1250
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Secularism
   rotate: false
-  xy: 1643, 1308
+  xy: 1701, 1366
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Socialism
   rotate: false
-  xy: 1701, 1308
+  xy: 1701, 1250
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Sovereignty
   rotate: false
-  xy: 1585, 1192
+  xy: 1643, 1192
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1231,7 +1245,7 @@ StatIcons/Happiness
   index: -1
 StatIcons/InterceptRange
   rotate: false
-  xy: 1540, 156
+  xy: 1250, 98
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1245,7 +1259,7 @@ StatIcons/Malcontent
   index: -1
 StatIcons/Movement
   rotate: false
-  xy: 1932, 1544
+  xy: 1874, 1486
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1266,14 +1280,14 @@ StatIcons/Production
   index: -1
 StatIcons/Range
   rotate: false
-  xy: 1658, 1482
+  xy: 1716, 1482
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 StatIcons/RangedStrength
   rotate: false
-  xy: 1716, 1482
+  xy: 1585, 1424
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1301,7 +1315,7 @@ StatIcons/Specialist
   index: -1
 StatIcons/Strength
   rotate: false
-  xy: 1643, 1192
+  xy: 1701, 1192
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1749,7 +1763,7 @@ TechIcons/Radio
   index: -1
 TechIcons/Railroad
   rotate: false
-  xy: 752, 438
+  xy: 1400, 978
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1985,20 +1999,6 @@ TileSets/Default/OasisOverlay
   orig: 100, 100
   offset: 0, 0
   index: -1
-TileSets/Default/Railroad
-  rotate: false
-  xy: 1400, 978
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-ImprovementIcons/Railroad
-  rotate: false
-  xy: 1400, 978
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
 TileSets/Default/Tiles/River-Bottom
   rotate: false
   xy: 1816, 417
@@ -3931,280 +3931,280 @@ UnitPromotionIcons/Air Repair
   orig: 50, 50
   offset: 0, 0
   index: -1
-UnitPromotionIcons/Ambush
+UnitPromotionIcons/Air Targeting
   rotate: false
-  xy: 1816, 1690
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Amphibious
-  rotate: false
-  xy: 1816, 1632
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Armor Plating
-  rotate: false
-  xy: 1192, 106
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Barrage
-  rotate: false
-  xy: 278, 11
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Besiege
-  rotate: false
-  xy: 336, 11
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Siege
-  rotate: false
-  xy: 336, 11
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Blitz
-  rotate: false
-  xy: 394, 11
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Boarding Party
-  rotate: false
-  xy: 452, 16
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Bombardment
-  rotate: false
-  xy: 510, 16
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Charge
-  rotate: false
-  xy: 568, 16
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Coastal Raider
-  rotate: false
-  xy: 760, 56
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Cover
-  rotate: false
-  xy: 992, 56
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-PolicyIcons/Discipline
-  rotate: false
-  xy: 992, 56
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Drill
-  rotate: false
-  xy: 1328, 272
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Evasion
-  rotate: false
-  xy: 1444, 272
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Extended Range
-  rotate: false
-  xy: 1502, 272
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Operational Range
-  rotate: false
-  xy: 1502, 272
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Flight Deck
-  rotate: false
-  xy: 1270, 214
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Formation
-  rotate: false
-  xy: 1328, 214
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Great Generals
-  rotate: false
-  xy: 1250, 156
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Quick Study
-  rotate: false
-  xy: 1250, 156
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Haka War Dance
-  rotate: false
-  xy: 1308, 156
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Heal Instantly
-  rotate: false
-  xy: 1366, 156
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Indirect Fire
-  rotate: false
-  xy: 1482, 156
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Interception
-  rotate: false
-  xy: 1250, 98
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Logistics
-  rotate: false
-  xy: 1424, 98
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/March
-  rotate: false
-  xy: 1540, 98
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Medic
-  rotate: false
-  xy: 1816, 1516
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Mobility
-  rotate: false
-  xy: 1932, 1660
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Morale
-  rotate: false
-  xy: 1932, 1602
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Rejuvenation
-  rotate: false
-  xy: 1585, 1366
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Scouting
-  rotate: false
-  xy: 1585, 1250
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Sentry
-  rotate: false
-  xy: 1585, 1250
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Shock
-  rotate: false
-  xy: 1701, 1366
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Slinger Withdraw
-  rotate: false
-  xy: 1643, 1250
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Sortie
-  rotate: false
-  xy: 1701, 1250
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Supply
-  rotate: false
-  xy: 1701, 1192
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitPromotionIcons/Survivalism
-  rotate: false
-  xy: 1581, 1134
+  xy: 1816, 1748
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Targeting
   rotate: false
-  xy: 1639, 1134
+  xy: 1816, 1748
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-UnitPromotionIcons/Targeting I (air)
+UnitPromotionIcons/Ambush
+  rotate: false
+  xy: 1816, 1632
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Amphibious
+  rotate: false
+  xy: 1816, 1574
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Armor Plating
+  rotate: false
+  xy: 220, 11
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Barrage
+  rotate: false
+  xy: 336, 11
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Besiege
+  rotate: false
+  xy: 394, 11
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Siege
+  rotate: false
+  xy: 394, 11
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Blitz
+  rotate: false
+  xy: 452, 16
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Boarding Party
+  rotate: false
+  xy: 510, 16
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Bombardment
+  rotate: false
+  xy: 568, 16
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Charge
+  rotate: false
+  xy: 626, 16
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Coastal Raider
+  rotate: false
+  xy: 818, 56
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Cover
+  rotate: false
+  xy: 1050, 56
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Discipline
+  rotate: false
+  xy: 1050, 56
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Drill
+  rotate: false
+  xy: 1386, 272
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Evasion
+  rotate: false
+  xy: 1502, 272
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Extended Range
+  rotate: false
+  xy: 1560, 272
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Operational Range
+  rotate: false
+  xy: 1560, 272
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Flight Deck
+  rotate: false
+  xy: 1328, 214
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Formation
+  rotate: false
+  xy: 1386, 214
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Great Generals
+  rotate: false
+  xy: 1308, 156
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Quick Study
+  rotate: false
+  xy: 1308, 156
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Haka War Dance
+  rotate: false
+  xy: 1366, 156
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Heal Instantly
+  rotate: false
+  xy: 1424, 156
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Indirect Fire
+  rotate: false
+  xy: 1540, 156
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Interception
+  rotate: false
+  xy: 1308, 98
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Logistics
+  rotate: false
+  xy: 1482, 98
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/March
+  rotate: false
+  xy: 1816, 1516
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Medic
+  rotate: false
+  xy: 1874, 1776
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Mobility
+  rotate: false
+  xy: 1874, 1544
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Morale
+  rotate: false
+  xy: 1932, 1544
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Rejuvenation
+  rotate: false
+  xy: 1643, 1424
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Scouting
+  rotate: false
+  xy: 1643, 1308
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Sentry
+  rotate: false
+  xy: 1643, 1308
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Shock
+  rotate: false
+  xy: 1643, 1250
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Slinger Withdraw
+  rotate: false
+  xy: 1701, 1308
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Sortie
+  rotate: false
+  xy: 1585, 1192
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Supply
+  rotate: false
+  xy: 1581, 1134
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Survivalism
   rotate: false
   xy: 1639, 1134
   size: 50, 50
diff --git a/android/assets/game.png b/android/assets/game.png
index 8e51dc50cc..c960dfc155 100644
Binary files a/android/assets/game.png and b/android/assets/game.png differ
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index 18facb8661..fe5935e0ef 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -4426,8 +4426,6 @@ Cover II = Cobertura II
 March = Marcha
 
 Mobility = Mobilidade
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = Sentinela
 
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index 4b3a7e4c0e..45b646d3a7 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -5726,8 +5726,6 @@ March =
 
  # Requires translation!
 Mobility = 
- # Requires translation!
-+[amount] Movement = 
 
  # Requires translation!
 Sentry = 
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 8a0a5753c6..95d29ffabe 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -3679,8 +3679,6 @@ Cover II = Krytí II
 March = Pochod
 
 Mobility = Pohyblivost
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = Stráž
 
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index 2e72194aff..af105d1aff 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -5117,8 +5117,6 @@ March =
 
  # Requires translation!
 Mobility = 
- # Requires translation!
-+[amount] Movement = 
 
  # Requires translation!
 Sentry = 
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index db4ee0496f..b2ecc35e3e 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -6524,8 +6524,6 @@ March =
 
  # Requires translation!
 Mobility = 
- # Requires translation!
-+[amount] Movement = 
 
  # Requires translation!
 Sentry = 
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index de63edb9a0..a09a8163f5 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -4755,8 +4755,6 @@ March = Marssi
 
  # Requires translation!
 Mobility = 
- # Requires translation!
-+[amount] Movement = 
 
  # Requires translation!
 Sentry = 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 726416ccab..6cc1f59f3e 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -3769,8 +3769,6 @@ Cover II = Protection II
 March = Marche
 
 Mobility = Mobilité
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = Sentinelle
 
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 8a05ee5bb2..0a3aae3c54 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -3575,7 +3575,6 @@ Cover II = Deckung II
 March = Marschieren
 
 Mobility = Mobilität
-+[amount] Movement = +[amount] Bewegungsrate
 
 Sentry = Wache
 
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 4a5af6be8b..f0106106b4 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -4452,8 +4452,6 @@ Cover II = Fedezék II
 March = Menetelés
 
 Mobility = Mozgékonyság
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = őrszem
 
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index fc0607d298..54314ae1bc 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -35,7 +35,6 @@ Requires [buildingName] to be built in all cities = Membutuhkan [buildingName] u
 Provides a free [buildingName] in the city = Memberikan [buildingName] gratis di kota
 Requires worked [resource] near city = Membutuhkan [resource] yang dikerjakan di kota
 Wonder is being built elsewhere = Keajaiban Dunia ini sedang dibangun di tempat lain
- # Requires translation!
 National Wonder is being built elsewhere = Keajaiban Nasional ini sedang dibangun di tempat lain
 Requires a [buildingName] in all cities = Membutuhkan [buildingName] yang sudah dibangun di semua kota
 Requires a [buildingName] in this city = Membutuhkan [buildingName] yang sudah dibangun di kota ini
@@ -62,7 +61,6 @@ Peace = Damai
 Research Agreement = Persetujuan Riset
 Declare war = Nyatakan perang
 Declare war on [civName]? = Nyatakan perang pada [civName]?
- # Requires translation!
 Let's begin! = Mari kita mulai!
 [civName] has declared war on us! = [civName] telah menyatakan perang pada kita!
 [leaderName] of [nation] = [leaderName] dari [nation]
@@ -89,14 +87,10 @@ We will remember this. = Kami akan mengingat ini.
 [civName] and [targetCivName] have signed a Peace Treaty! = [civName] dan [targetCivName] menandatangani Perjanjian Perdamaian!
 [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] and [targetCivName] sudah menandatangani Deklarasi Pertemanan!
 [civName] has denounced [targetCivName]! = [civName] telah menghina [targetCivName]!
- # Requires translation!
 Do you want to break your promise to [leaderName]? = Apakah kamu yakin ingin mengingkari janjimu ke  [leaderName]?
- # Requires translation!
 We promised not to settle near them ([count] turns remaining) = Kita sudah berjanji untuk tidak menetap di dekat mereka ([count] giliran lagi)
- # Requires translation!
 They promised not to settle near us ([count] turns remaining) = Mereka sudah berjanji untuk tidak menetap di dekat kita ([count] giliran lagi)
 
-
 Unforgivable = Tak Termaafkan
 Enemy = Musuh
 Competitor = Saingan
@@ -222,7 +216,6 @@ Default = Bawaan
 Pangaea = Pangaea
 Perlin = Perlin
 Continents = Benua
- # Requires translation!
 Four Corners = Empat Penjuru
 Archipelago = Kepulauan
 Number of City-States = Jumlah Negara-Kota
@@ -241,7 +234,6 @@ Rectangular = Persegi panjang
 
 Show advanced settings = Tampilkan pengaturan lebih lanjut
 Hide advanced settings = Sembunyikan pengaturan lebih lanjut
- # Requires translation!
 RNG Seed = Benih Acak
 Map Height = Tinggi Peta
 Temperature extremeness = Kondisi temperatur
@@ -253,10 +245,8 @@ Biome areas extension = Perbentangan area bioma
 Water level = Tinggi permukaan air
 Reset to default = Atur ulang sesuai bawaan
 
- # Requires translation!
 Show experimental world wrap for maps = Tunjukkan fitur eksperimental dunia gabungan untuk peta
 HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = HANYA EKSPERIMEN - ANDA TELAH DIPERINGATKAN!
- # Requires translation!
 Enable portrait orientation = Perbolehkan orientasi potret
 Online Multiplayer = Multiplayer Daring
 
@@ -363,13 +353,9 @@ If you could copy your game data ("Copy saved game to clipboard" -  = Jika Anda
   paste into an email to yairm210@hotmail.com) =  tempel dalam email ke yairm210@hotmail.com
 I could maybe help you figure out what went wrong, since this isn't supposed to happen! = Saya mungkin dapat menolong Anda mencari tahu apa yang salah, karena hal ini tidak seharusnya terjadi!
 Missing mods: [mods] = Mod yang hilang: [mods]
- # Requires translation!
 Load from custom location = Muat dari lokasi tertentu
- # Requires translation!
 Could not load game from custom location! = Tidak dapat memuat dari lokasi tertentu
- # Requires translation!
 Save to custom location = Simpan ke lokasi tertentu
- # Requires translation!
 Could not save game to custom location! = Tidak dapat menyimpan ke lokasi tertentu
 
 # Options
@@ -411,13 +397,9 @@ Locate mod errors = Temukan eror mod
 
 Research of [technologyName] has completed! = Riset untuk [technologyName] sudah selesai
 [construction] has become obsolete and was removed from the queue in [cityName]! = [construction] sudah ketinggalan zaman dan akan dihapus dari antrean konstruksi di [cityName]!
- # Requires translation!
 [construction] has become obsolete and was removed from the queue in [amount] cities! = [construction] telah ketinggalan zaman dan telah dihapus dari antrean di [amount] kota!
- # Requires translation!
 [cityName] changed production from [oldUnit] to [newUnit] = [cityName] telah mengalihkan produksi [oldUnit] ke [newUnit]
- # Requires translation!
 [amount] cities changed production from [oldUnit] to [newUnit] = [amount] kota telah mengalihkan produksi dari [oldUnit] ke [newUnit]
- # Requires translation!
 Excess production for [wonder] converted to [goldAmount] gold = Kelebihan produksi untuk [wonder] telah dialihkan menjadi [goldAmount] emas
 You have entered a Golden Age! = Kamu telah memasuki masa kejayaan!
 [resourceName] revealed near [cityName] = [resourceName] terlihat di dekat [cityName]
@@ -429,15 +411,10 @@ Cannot provide unit upkeep for [unitName] - unit has been disbanded! = Tidak bis
 [cityName] is starving! = [cityName] sedang kelaparan!
 [construction] has been built in [cityName] = [construction] telah dibangun di [cityName]
 [wonder] has been built in a faraway land = [wonder] sudah dibangun di tempat lain
- # Requires translation!
 [civName] has completed [construction]! = [civName] telah menyelesaikan pembangunan [construction]!
- # Requires translation!
 An unknown civilization has completed [construction]! = Peradaban tak dikenal telah menyelesaikan pembangunan [construction]!
- # Requires translation!
 The city of [cityname] has started constructing [construction]! = Kota [cityname] telah memulai pembangunan [construction]!
- # Requires translation!
 [civilization] has started constructing [construction]! = [civilization] telah memulai pembangunan [construction]!
- # Requires translation!
 An unknown civilization has started constructing [construction]! = Peradaban tak dikenal telah memulai pembangunan [construction]!
 Work has started on [construction] = Pembangunan [construction] telah dimulai
 [cityName] cannot continue work on [construction] = [cityName] tidak bisa melanjutkan pembangunan [construction]
@@ -464,14 +441,11 @@ An enemy [unit] was spotted near our territory = [unit] musuh terlihat di dekat
 An enemy [unit] was spotted in our territory = [unit] musuh terlihat di daerah kita
 [amount] enemy units were spotted near our territory = [amount] unit musuh terlihat di dekat daerah kita
 [amount] enemy units were spotted in our territory = [amount] unit musuh terlihat di daerah kita
- # Requires translation!
 A(n) [nukeType] exploded in our territory! = Sebuah [nukeType] telah meledak di daerah kita!
 After being hit by our [nukeType], [civName] has declared war on us!
 The civilization of [civName] has been destroyed! = Peradaban [civName] telah hancur!
 The City-State of [name] has been destroyed! = Negara-Kota [name] telah hancur!
- # Requires translation!
 Your [ourUnit] captured an enemy [theirUnit]! = [ourUnit] kamu telah menawan [theirUnit] musuh!
- # Requires translation!
 Your [ourUnit] plundered [amount] [Stat] from [theirUnit] = [ourUnit] kamu telah menjarah [amount] [Stat] dari [theirUnit]
 We have captured a barbarian encampment and recovered [goldAmount] gold! = Kita telah menangkap sebuah perkemahan orang barbar dan mendapat emas sebanyak [goldAmount]!
 A barbarian [unitType] has joined us! = Sekelompok [unitType], mantan orang barbar, telah bergabung dengan kita!
@@ -519,11 +493,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = Penebangan
 The resistance in [cityName] has ended! = Pemberontakan di [cityName] sudah reda!
 Our [name] took [tileDamage] tile damage and was destroyed = [name] kita mendapatkan [tileDamage] kerusakan daerah dan telah kandihancur
 Our [name] took [tileDamage] tile damage = [name] kita mendapatkan [tileDamage] kerusakan daerah
- # Requires translation!
 [civName] has adopted the [policyName] policy = [civName] telah mengadopsi kebijakan [policyName]
- # Requires translation!
 An unknown civilization has adopted the [policyName] policy = Peradaban tak dikenal telah telah mengadopsi kebijakan [policyName]
- # Requires translation!
 Our influence with City-States has started dropping faster! = Pengaruh kita dengan negara-kota mulai turun dengan cepat
 
 # World Screen UI
@@ -548,7 +519,6 @@ Bombard strength = Kekuatan bombardir
 Range = Jarak
 Move unit = Gerakkan unit
 Stop movement = Hentikan pergerakan
- # Requires translation!
 Swap units = Tukar unit
 Construct improvement = Bangun peningkatan
 Automate = Otomatisasi
@@ -561,7 +531,6 @@ Sleep = Istirahat
 Sleep until healed = Istirahat hingga pulih
 Moving = Bergerak
 Set up = Persiapkan
- # Requires translation!
 Paradrop = Terjun payung
 Upgrade to [unitType] ([goldCost] gold) = Tingkatkan ke [unitType] ([goldCost] emas)
 Found city = Dirikan kota
@@ -571,7 +540,6 @@ Disband unit = Bubarkan unit
 Explore = Jelajah
 Stop exploration = Hentikan penjelajahan
 Pillage = Jarah
- # Requires translation!
 Are you sure you want to pillage this [improvement]? = Apakah kamu yakin ingin menjarah [improvement] ini?
 Do you really want to disband this unit? = Apakah Anda benar ingin membubarkan unit ini?
 Disband this unit for [goldAmount] gold? = Bubarkan unit ini untuk ditukar dengan [goldAmount] emas?
@@ -734,13 +702,9 @@ Water resource = Sumber daya air
 River = Sungai
 Fresh water = Air tawar
 non-fresh water = air asin
- # Requires translation!
 Coastal = Pesisir
- # Requires translation!
 Bonus resource = Sumber daya bonus
- # Requires translation!
 Strategic resource = Sumber daya strategis
- # Requires translation!
 Luxury resource = Barang mewah
 
 Wonders = Keajaiban Dunia
@@ -846,7 +810,6 @@ Units that consume this resource = Unit yang menggunakan sumber daya ini
 Can be built on  = Dapat dibangun di
 Defence bonus = Bonus pertahanan
 Movement cost = Biaya pergerakan
- # Requires translation!
 Open terrain = Medan terbuka
 Rough Terrain = Medan Kasar
  for  =  untuk 
@@ -883,13 +846,9 @@ Menu = Menu
 Brush Size = Ukuran Kuas
 Map saved = Peta tersimpan
 Change ruleset = Ubah set peraturan
- # Requires translation!
 Base terrain [terrain] does not exist in ruleset! = Medan dasar [terrain] tidak ditemukan di aturan dasar!
- # Requires translation!
 Terrain feature [feature] does not exist in ruleset! = Fitur medan [feature] tidak ditemukan di aturan dasar!
- # Requires translation!
 Resource [resource] does not exist in ruleset! = Sumber daya [resource] tidak ditemukan di aturan dasar!
- # Requires translation!
 Improvement [improvement] does not exist in ruleset! = Peningkatan [improvement] tidak ditemukan di aturan dasar!
 Change map to fit selected ruleset? = Ubah peta supaya sesuai dengan set peraturan?
 
@@ -1027,14 +986,12 @@ Download = Unduh
 Done! = Selesai!
 Delete [modName] = Hapus [modName]
 Are you SURE you want to delete this mod? = Apakah kamu YAKIN untuk menghapus mod ini?
- # Requires translation!
 [mod] was deleted. = [mod] telah dihapus.
 Updated = Diperbarui
 Current mods = Mod yang dimiliki
 Downloadable mods = Mod yang dapat diunduh
 Next page = Halaman selanjutnya
 Open Github page = Buka laman Github
- # Requires translation!
 Permanent audiovisual mod = Mod audiovisual permanen
 Installed = Terpasang
 Downloaded! = Berhasil diunduh!
@@ -1042,9 +999,7 @@ Could not download mod = Tidak dapat mengunduh mod
 Online query result is incomplete = Hasil pencarian daring tidak komplet
 No description provided = Deskripsi tidak tersedia
 [stargazers]✯ = [stargazers]✯
- # Requires translation!
 Author: [author] = Pembuat: [author]
- # Requires translation!
 Size: [size] kB = Ukuran: [size] kB
  
 # Uniques that are relevant to more than one type of game object
@@ -1058,11 +1013,8 @@ Must be on [terrain] = Harus berada di [terrain]
 +[amount]% vs [unitType] = +[amount]% vs [unitType]
 +[amount] Movement for all [unitType] units = +[amount] Pergerakan untuk semua [unitType].
 +[amount]% Production when constructing [param] = +[amount]% produksi ketika membangun [param]
- # Requires translation!
 Can only be built on [tileFilter] tiles = Hanya dapat dibangun di daerah [tileFilter]
- # Requires translation!
 Cannot be built on [tileFilter] tiles = Tidak dapat dibangun di daerah [tileFilter]
- # Requires translation!
 Does not need removal of [feature] = Tidak memerlukan penyingkiran [feature]
 
 # City filters
@@ -1083,9 +1035,7 @@ Monument = Monumen
 
 Granary = Lumbung
 
- # Requires translation!
 Hidden when religion is disabled = Disembunyikan ketika fitur agama dimatikan
- # Requires translation!
 Shrine = Kuil
 
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson = 'Bukan dengan banyaknya keindahan sang hutan menggugat hati manusia, tetapi dengan adanya hal-hal kecil seperti segarnya udara dan aura pohon-pohon tua, mereka mengubah dan memperbarui jiwa yang letih lesu dengan begitu hebatnya.'  - Robert Louis Stevenson
@@ -1119,7 +1069,6 @@ Walls = Tembok
 Walls of Babylon = Tembok Babel
 
 'O, let not the pains of death which come upon thee enter into my body. I am the god Tem, and I am the foremost part of the sky, and the power which protecteth me is that which is with all the gods forever.'  - The Book of the Dead, translated by Sir Ernest Alfred Wallis Budge = 'O, jangan biarkan rasa sakit dari kematianmu datang merasuki tubuhku. Aku adalah sang dewa Tem, dan aku adalah bagian terpenting dari langit, dan kekuatan yang melindungiku sama dengan kekuatan yang bersama semua dewa selamanya'  - Kitab Kematian, diterjemahkan oleh Tuan Ernest Alfred Wallis Budge
- # Requires translation!
 -[amount]% tile improvement construction time = -[amount]% waktu yang diperlukan untuk pembangunan peningkatan daerah
 [amount] free [unit] units appear = [amount] unit [unit] gratis muncul
 The Pyramids = Piramida
@@ -1141,7 +1090,6 @@ Statue of Zeus = Patung Zeus
 Lighthouse = Mercusuar
 
 'They that go down to the sea in ships, that do business in great waters; these see the works of the Lord, and his wonders in the deep.' - The Bible, Psalms 107:23-24 = 'Ada orang-orang yang mengarungi laut dengan kapal-kapal, yang melakukan perdagangan di lautan luas; mereka melihat pekerjaan-pekerjaan Tuhan,  dan perbuatan-perbuatan-Nya yang ajaib di tempat yang dalam.' - Alkitab, Mazmur 107:23-24
- # Requires translation!
 +[amount] Sight for all [param] units = +[amount] Penglihatan untuk semua unit [param]
 The Great Lighthouse = Mercusuar Mulia
 
@@ -1168,7 +1116,6 @@ National College = Perguruan Tinggi Nasional
 Free Social Policy = Kebijakan Sosial Gratis
 The Oracle = Oracle
 
- # Requires translation!
 Amphitheater = Amfiteater
 
 Doubles Gold given to enemy if city is captured = Menggandakan Emas yang diberikan kepada musuh jika kota ini direbut
@@ -1186,10 +1133,8 @@ Bazaar = Bazar
 
 Mint = Percetakan Uang Logam
 
- # Requires translation!
 '...who drinks the water I shall give him, says the Lord, will have a spring inside him welling up for eternal life. Let them bring me to your holy mountain in the place where you dwell. Across the desert and through the mountain to the Canyon of the Crescent Moon...'  - Indiana Jones = '...yang meminum air akan Kuberikan, firman Tuhan, akan Kutempatkan mata air di dalamnya yang mengalir sepanjang hidupnya. Biarlah mereka membawaku ke gunung kudus-Mu di mana Kautinggal. Melintasi padang gurun dan melewati gunung ke Ngarai Bulan Sabit...'
 [stats] once [tech] is discovered = [stats] ketika [tech] ditemukan
- # Requires translation!
 Petra = Petra
 
 [amount]% of food is carried over after population increases = [amount]% makanan dibawa setelah penambahan populasi
@@ -1282,7 +1227,6 @@ Free Great Person = Gratis Orang Hebat
 Leaning Tower of Pisa = Menara Miring Pisa
 
 'Bushido is realized in the presence of death. This means choosing death whenever there is a choice between life and death. There is no other reasoning.'  - Yamamoto Tsunetomo = 'Bushido akan terasa saat kematian hadir. Ini berarti memilih untuk mati di setiap pilihan antara hidup dan mati. Tidak perlu pertimbangan lagi.' - Yamamoto Tsunetomo
- # Requires translation!
 +[amount]% Strength for units fighting in [param] = +[amount]% Kekuatan untuk unit yang berperang di [param]
 Himeji Castle = Kastil Himeji
 
@@ -1296,13 +1240,11 @@ Taj Mahal = Taj Mahal
 
 'Things always seem fairer when we look back at them, and it is out of that inaccessible tower of the past that Longing leans and beckons.'  - James Russell Lowell = 'Semuanya selalu terlihat lebih indah ketika kita merenungkannya, dan di luar menara masa lalu yang tidak memiliki pintu disanalah kerinduan bersandar dan memberikan isyarat.'  - James Russell Lowell
 Free [unit] appears = [unit] gratis muncul
- # Requires translation!
 Science gained from research agreements +[amount]% = Ilmu pengetahuan yang didapat dari persetujuan riset +[amount]%
 Porcelain Tower = Menara Porselen
 
 Windmill = Kincir Angin
 
- # Requires translation!
 Arsenal = Gudang Senjata
 
 'The Law is a fortress on a hill that armies cannot take or floods wash away.'  - The Prophet Muhammed = 'Hukum seperti sebuah benteng di bukit yang tidak dapat direbut pasukan atau tersapu banjir.'   – Nabi Muhammad
@@ -1339,7 +1281,6 @@ Broadcast Tower = Menara Radio
 Provides 1 happiness per 2 additional social policies adopted = Menyediakan 1 kebahagiaan tiap 2 tambahan kebijakan sosial yang diadopsi
 Eiffel Tower = Menara Eiffel
 
- # Requires translation!
 Military Base = Pangkalan Militer
 
 'Give me your tired, your poor, your huddled masses yearning to breathe free, the wretched refuse of your teeming shore. Send these, the homeless, tempest-tossed to me, I lift my lamp beside the golden door!'  - Emma Lazarus = 'Berikan aku mereka yang letih lesu, miskin, dan orang meringkuk yang rindu untuk bernapas dengan bebas, para bedebah yang menolak pantaimu yang penuh sesak. Kirimkan, para tunawisma, mereka yang terguncang kepadaku, aku mengangkat lampuku di samping pintu emas!'  - Emma Lazarus
@@ -1358,7 +1299,6 @@ Cristo Redentor = Kristus Penebus
 Medical Lab = Lab Medis
 
 Enables nuclear weapon = Perbolehkan senjata nuklir
- # Requires translation!
 Triggers a global alert upon completion = Memicu peringatan global saat selesai
 Manhattan Project = Proyek Manhattan
 
@@ -1376,17 +1316,12 @@ Nuclear Plant = PLTN
 Enables construction of Spaceship parts = Memungkinkan konstruksi Pesawat Antariksa
 Apollo Program = Program Apollo
 
- # Requires translation!
 'Nothing travels faster than light with the possible exception of bad news, which obeys its own special rules.' - Douglas Adams = 'Tidak ada yang bisa melaju secepat cahaya kecuali berita buruk, yang mematuhi aturan khususnya sendiri.' - Douglas Adams
- # Requires translation!
 [amount] population [cityFilter] = [amount] populasi [cityFilter]
 [stats] [cityFilter] = [stats] [cityFilter]
- # Requires translation!
 CN Tower = Menara CN
 
- # Requires translation!
 Population loss from nuclear attacks -[amount]% = Penurunan populasi dari serangan nuklir -[amount]%
- # Requires translation!
 Bomb Shelter = Tempat Perlindungan Bom
 
 Spaceship part = Bagian Pesawat Antariksa
@@ -1403,15 +1338,10 @@ SS Engine = Mesin PA
 
 SS Stasis Chamber = Ruang Stasis PA
 
- # Requires translation!
 Hidden until [amount] social policy branches have been completed = Disembunyikan hingga [amount] cabang kebijakan sosial telah diselesaikan
- # Requires translation!
 Triggers a global alert upon build start = Memicu peringatan global ketika memulai pembangunan
- # Requires translation!
 Triggers a Cultural Victory upon completion = Memicu Kemenangan Kebudayaan saat diselesaikan
- # Requires translation!
 Hidden when cultural victory is disabled = Disembunyikan ketika kemenangan kebudayaan dimatikan
- # Requires translation!
 Utopia Project = Proyek Utopia
 
 
@@ -1426,7 +1356,6 @@ Warlord = Panglima Perang
 Prince = Pangeran
 
 King = Raja
- # Requires translation!
 Era Starting Unit = Unit Awal Era
 
 Emperor = Kaisar
@@ -1454,9 +1383,7 @@ What do YOU want?! = Apa yang KAU mau?!
 Ingenuity = Kecerdasan
 Receive free [unit] when you discover [tech] = Mendapat [unit] gratis ketika menemukan [tech]
 [unit] is earned [amount]% faster = [unit] didapatkan [amount]% lebih cepat
- # Requires translation!
 May the blessings of heaven be upon you, O great Nebuchadnezzar, father of mighty and ancient Babylon! Young was the world when Sargon built Babylon some five thousand years ago, long did it grow and prosper, gaining its first empire the eighteenth century BC, under godlike Hammurabi, the giver of law. Although conquered by the Kassites and then by the Assyrians, Babylon endured, emerging phoenix-like from its ashes of destruction and regaining its independence despite its many enemies. Truly was Babylon the center of arts and learning in the ancient world. O Nebuchadnezzar, your empire endured but a short time after your death, falling to the mighty Persians, and then to the Greeks, until the great city was destroyed by 141 BC. = Kiranya berkat dari surga turun atasmu, Yang Mulia Nebukadnezar, bapak Babel kuno yang kuat! Dunia masih muda ketika Sargon membangun Babel sekitar lima ribu tahun yang lalu, sudah lama dia bertumbuh dan menjadi makmur, menjadi kekaisaran pertama kali pada abad kedelapan belas SM, di bawah Hammurabi, manusia setengah dewa, sang pemberi hukum. Meskipun dikuasai bangsa Kass dan Asyur, Babel tetap bertahan, keluar seperti burung phoenix dari abu kehancuran dan mendapatkan kembali kemerdekaannya meskipun banyak juga musuhnya. Babel betul-betul merupakan pusat kesenian dan pendidikan dunia kuno. O Nebukadnezar, kekaisaranmu bertahan hanya sebentar setelah kematianmu, berpindah tangan kepada bangsa Persia yang kuat, lalu kepada bangsa Yunani, hingga kota besar itu dihancurkan pada 141 SM.
- # Requires translation!
 But is Babylon indeed gone forever, great Nebuchadnezzar? Your people look to you to bring the empire back to life once more. Will you accept the challenge? Will you build a civilization that will stand the test of time? = Namun, benarkah Babel hilang untuk selamanya, Yang Mulia Nebukadnezar? Rakyatmu mencarimu untuk membawa kekaisaran ini hidup kembali. Bersediakah engkau untuk menerima tantangan ini? Apakah engkau akan membangun peradaban yang akan bertahan seiring berjalannya waktu?
 Akkad = Akkad
 Dur-Kurigalzu = Dur-Kurigalzu
@@ -2841,7 +2768,6 @@ Cities are razed [amount] times as fast =
 Your men stand proudly to greet you, Great Attila, grand warrior and ruler of the Hunnic empire. Together with your brother Bleda you expanded the boundaries of your empire, becoming the most powerful and frightening force of the 5th century. You bowed the Eastern Roman Emperors to your will and took kingdom after kingdom along the Danube and Nisava Rivers. As the sovereign ruler of the Huns, you marched your army across Europe into Gaul, planning to extend your already impressive lands all the way to the Atlantic Ocean. Your untimely death led to the quick disintegration and downfall of your empire, but your name and deeds have created an everlasting legacy for your people.  = 
  # Requires translation!
 Fearsome General, your people call for the recreation of a new Hunnic Empire, one which will make the exploits and histories of the former seem like the faded dreaming of a dying sun. Will you answer their call to regain your rightful prominence and glory? Will you mount your steadfast steed and lead your armies to victory? Will you build a civilization that stands the test of time?  = 
- # Requires translation!
 Atilla's Court = Pengadilan Attila
 
 Milan = Milan
@@ -2942,7 +2868,6 @@ We are no strangers to war. You have strayed from the right path, and now we wil
 You are nothing but a glorified barbarian. Cruel, and ruthless. = Kamu tidak lain adalah orang barbar yang diagung-agungkan. Bengis, juga kejam.
 
 Mogadishu = Mogadishu
- # Requires translation!
 Congratulations, conqueror. This tribe serves you now. = Selamat, penakluk. Suku ini melayanimu sekarang.
 
 Barbarians = Orang Barbar
@@ -3206,9 +3131,7 @@ Construction = Konstruksi
 
 Philosophy = Filosofi
 'There is only one good, knowledge, and one evil, ignorance.' - Socrates = 'Hanya ada satu yang baik, yaitu pengetahuan, dan satu yang jahat, yaitu ketidakpedulian.' - Sokrates
- # Requires translation!
 Drama and Poetry = Puisi dan Drama
- # Requires translation!
 'What is drama but life with the dull bits cut out.' - Alfred Hitchcock = 'Drama hanyalah hidup dengan bagian membosankannya yang sudah dibuang.' - Alfred Hitchcock
 Currency = Mata Uang
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Lebih baik sepotong roti dengan hati yang senang daripada kekayaan dengan kejengkelan.' - Amenemope
@@ -3312,7 +3235,6 @@ Ballistics = Balistik
 Combustion = Pembakaran
 'Any man who can drive safely while kissing a pretty girl is simply not giving the kiss the attention it deserves.' - Albert Einstein = 'Pria yang bisa menyetir dengan selamat sambil mencium wanita yang cantik tidak memberikan ciuman tersebut perhatian yang pantas didapatkan.' - Albert Einstein
 
- # Requires translation!
 Atomic era = Era Atomik
 Pharmaceuticals = Farmasi
 'In nothing do men more nearly approach the gods than in giving health to men.' - Cicero = 'Tidak ada hal di mana manusia lebih mirip dengan para dewa dibandingkan menyembuhkan manusia lainnya.' - Cicero
@@ -3333,13 +3255,11 @@ Computers = Komputer
 'Computers are like Old Testament gods: lots of rules and no mercy.' - Joseph Campbell = 'Komputer adalah seperti Tuhan di Perjanjian Lama: banyak aturan dan tanpa belas kasihan.' - Joseph Campbell
 
 Information era = Era Informasi
- # Requires translation!
 Telecommunications = Telekomunikasi
  # Requires translation!
 'The more we elaborate our means of communication, the less we communicate.' - J.B. Priestly = 
 Mobile Tactics = Taktik Gerilya
 'All men can see these tactics whereby I conquer, but what none can see is the strategy out of which victory is evolved.' - Sun Tzu = 'Semua orang dapat mengamati taktik yang aku pakai untuk menaklukkan, tetapi apa yang tidak bisa orang lihat adalah strategi dari mana kemenangan dikembangkan.' - Sun Tzu
- # Requires translation!
 Advanced Ballistics = Balistik Lanjutan
  # Requires translation!
 'Our scientific power has outrun our spiritual power, we have guided missiles and misguided men.' – Martin Luther King Jr. = 
@@ -3353,13 +3273,11 @@ Lasers = Laser
 
 Particle Physics = Fisika Partikel
 'Every particle of matter is attracted by or gravitates to every other particle of matter with a force inversely proportional to the squares of their distances.' - Isaac Newton = 'Setiap partikel sebuah materi tertarik kepada atau condong pada setiap partikel dari materi lainnya dengan sebuah gaya yang berbanding terbalik dengan kuadrat jaraknya.' - Isaac Newton
- # Requires translation!
 Nuclear Fusion = Fusi Nuklir
  # Requires translation!
 'The release of atomic energy has not created a new problem. It has readily made more urgent the necessity of solving an existing one.' - Albert Einstein = 
 Nanotechnology = Teknologi Nano
 'The impact of nanotechnology is expected to exceed the impact that the electronics revolution has had on our lives.' - Richard Schwartz = 'Dampak teknologi nano diperkirakan akan melampaui dampak yang dihasilkan revolusi elektronik pada kehidupan kita.' - Richard Schwartz
- # Requires translation!
 Stealth = Siluman
  # Requires translation!
 'Be extremely subtle, even to the point of formlessness, be extremely mysterious, even to the point of soundlessness. Thereby you can be the director of the opponent's fate.' - Sun Tzu = 
@@ -3400,9 +3318,7 @@ Hill = Bukit
 
 Provides a one-time Production bonus to the closest city when cut down = Menyediakan bonus Produksi satu kali ke kota terdekat ketika ditebang
 Blocks line-of-sight from tiles at same elevation = Menghalangi pandangan dari daerah dengan ketinggian yang sama
- # Requires translation!
 Resistant to nukes = Tahan terhadap nuklir
- # Requires translation!
 Can be destroyed by nukes = Dapat dihancurkan nuklir
 Forest = Hutan
 
@@ -3598,7 +3514,6 @@ Barrage III = Rentetan III
 Volley = Voli
 
 Extended Range = Perpanjangan Jarak
- # Requires translation!
 [amount] Range = [amount] Jarak
 
 Indirect Fire = Serangan Tidak Langsung
@@ -3625,7 +3540,6 @@ Formation I = Formasi I
 Formation II = Formasi II
 
 Blitz = Blitz
- # Requires translation!
 [amount] additional attacks per turn = [amount] serangan tambahan tiap giliran
 
 Woodsman = Ahli Hutan
@@ -3638,22 +3552,17 @@ Medic = Medis
 Medic II = Medis II
 
 Scouting I = Pengintaian I
- # Requires translation!
 [amount] Visibility Range = [amount] Jarak Penglihatan
 
 Scouting II = Pengintaian II
 
 Scouting III = Pengintaian III
- # Requires translation!
 [amount] Movement = [amount] Pergerakan
 
- # Requires translation!
 Survivalism I = Penyintasan I
 
- # Requires translation!
 Survivalism II = Penyintasan II
 
- # Requires translation!
 Survivalism III = Penyintasan III
 
 Boarding Party I = Rombongan Pelaut I
@@ -3689,14 +3598,12 @@ Armor Plating II = Pelapisan Baja II
 Armor Plating III = Pelapisan Baja III
 
 Flight Deck I = Dek Penerbangan I
- # Requires translation!
 Can carry [amount] extra [param] units = Dapat membawa [amount] unit [param] tambahan
 
 Flight Deck II = Dek Penerbangan II
 
 Flight Deck III = Dek Penerbangan III
 
- # Requires translation!
 Supply = Pasokan
 
 Siege I = Kepungan I
@@ -3706,25 +3613,20 @@ Siege II = Kepungan II
 Siege III = Kepungan III
 
 Evasion = Penghindaran
- # Requires translation!
 Damage taken from interception reduced by [amount]% = Kerusakan dari pencegatan berkurang sebesar [amount]%
 
 Interception I = Pencegatan I
- # Requires translation!
 [amount]% Damage when intercepting = [amount]% Kerusakan ketika melakukan pencegatan
 
 Interception II = Pencegatan II
 
 Interception III = Pencegatan III
 
- # Requires translation!
 Air Targeting I = Bidikan Udara I
 
- # Requires translation!
 Air Targeting II = Bidikan Udara II
 
 Sortie = Penyebaran
- # Requires translation!
 [amount] extra interceptions may be made per turn = [amount] cegatan tambahan dapat dilakukan tiap giliran
 
 Operational Range = Jarak Operasional
@@ -3733,7 +3635,6 @@ Air Repair = Perbaikan di Udara
 Unit will heal every turn, even if it performs an action = Unit akan sembuh setiap giliran, bahkan jika melakukan suatu aksi
 
 Cover I = Berlindung I
- # Requires translation!
 [amount]% Strength when defending vs [unitType] = [amount]% Kekuatan ketika berlindung vs [unitType]
 
 Cover II = Berlindung II
@@ -3741,13 +3642,10 @@ Cover II = Berlindung II
 March = Berbaris
 
 Mobility = Mobilitas
- # Requires translation!
-+[amount] Movement = +[amount] Pergerakan
 
 Sentry = Penjagaan
 
 Logistics = Logistik
- # Requires translation!
 [amount] additional attack per turn = [amount] serangan tambahan tiap giliran
 
 Ambush I = Sergapan I
@@ -3771,7 +3669,6 @@ Quick Study = Belajar Cepat
 [amount]% Bonus XP gain = Mendapat [amount]% Bonus XP
 
 Haka War Dance = Tarian Perang Haka
- # Requires translation!
 [amount]% Strength for enemy [unitType] units in adjacent [param] tiles = [amount]% Kekuatan untuk unit musuh [unitType] di daerah [param] yang bersebelahan
 
 Rejuvenation = Pemudaan
@@ -3783,7 +3680,6 @@ May withdraw before melee ([amount]%) = Dapat mundur sebelum pertempuran jarak d
 
 #################### Lines from Units from Civ V - Vanilla ####################
 
- # Requires translation!
 Can build [param] improvements on tiles = Dapat membangun peningkatan [param] di daerah
 
 Excess Food converted to Production when under construction = Kelebihan Makanan dikonversi menjadi Produksi dalam masa pembangunan
@@ -3820,7 +3716,6 @@ No defensive terrain bonus = Tidak ada bonus perlindungan medan
 
 War Chariot = Kereta Perang
 
- # Requires translation!
 Horse Archer = Pemanah Berkuda
 
 War Elephant = Gajah Perang
@@ -3830,19 +3725,14 @@ Spearman = Prajurit Bertombak
 Hoplite = Hoplite
 
 Persian Immortal = Pasukan Abadi Persia
- # Requires translation!
 +[amount] HP when healing = +[amount] HP saat penyembuhan
 
- # Requires translation!
 Battering Ram = Pelantak tubruk
- # Requires translation!
 Can only attack [unitType] units = Hanya dapat menyerang unit [unitType]
- # Requires translation!
 -[amount] Visibility Range = -[amount] Jarak Penglihatan
 
 Horseman = Pasukan Berkuda
 Can move after attacking = Dapat bergerak setelah menyerang 
- # Requires translation!
 -[amount]% Strength vs [unitType] = -[amount]% Kekuatan vs [unitType]
 
 Companion Cavalry = Kavaleri Kompani
@@ -3910,9 +3800,7 @@ Minuteman = Minuteman
 
 Tercio = Tercio
 
- # Requires translation!
 Privateer = Privateer
- # Requires translation!
 May capture killed [param] units = Dapat membajak unit [param] yang dikalahkan
 
 Frigate = Fregat
@@ -3961,7 +3849,6 @@ Infantry = Infanteri
 
 Carrier = Kapal Induk
 Cannot attack = Tidak bisa menyerang
- # Requires translation!
 Can carry [amount] [param] units = Dapat membawa [amount] unit [param]
 
 Battleship = Kapal Tempur
@@ -3974,7 +3861,6 @@ Landship = Tank Kapaldarat
 
 Destroyer = Kapal Perusak
 
- # Requires translation!
 [amount] Sight for all [param] units = [amount] Penglihatan untuk semua unit [param]
 
 Fighter = Pesawat Tempur
@@ -3985,7 +3871,6 @@ Bomber = Pengebom
 
 B17 = B17
 
- # Requires translation!
 May Paradrop up to [amount] tiles from inside friendly territory = Dapat terjun payung hingga jarak [amount] daerah dari dalam daerah kekaisaran
 
 Tank = Tank
@@ -3995,9 +3880,7 @@ Panzer = Panzer
 Anti-Tank Gun = Senjata Anti-Tank
 
 Self-destructs when attacking = Menghancurkan diri ketika menyerang
- # Requires translation!
 Nuclear weapon of Strength [amount] = Kekuatan nuklir [amount]
- # Requires translation!
 Blast radius [amount] = Jarak ledakan [amount]
 
 Rocket Artillery = Artileri Roket
@@ -4016,20 +3899,15 @@ Nuclear Submarine =
 
 Mechanized Infantry = Pasukan Mekanis
 
- # Requires translation!
 Missile Cruiser = Kapal Penjelajah Misil
 
 Modern Armor = Tank Modern
 
- # Requires translation!
 Jet Fighter = Jet tempur
 
- # Requires translation!
 Giant Death Robot = Robot Kematian Raksasa
 
- # Requires translation!
 Stealth Bomber = Pengebom Siluman
- # Requires translation!
 Cannot be carried by [unit] units = Tidak dapat dibawa oleh unit [unit]
 
 Great Artist = Seniman Hebat
@@ -4174,70 +4052,37 @@ Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+',
 F1 - Open Civilopedia\nF2 - Empire overview Trades\nF3 - Empire overview Units\nF4 - Empire overview Diplomacy\nF5 - Social policies\nF6 - Technologies\nF7 - Empire overview Cities\nF8 - Victory Progress\nF9 - Empire overview Stats\nF10 - Empire overview Resources\nF11 - Quicksave\nF12 - Quickload = F1 - Buka Civilopedia\nF2 - Gambaran Perdagangan kekaisaran\nF3 - Gambaran Unit kekaisaran\nF4 - Gambaran Diplomasi kekaisaran\nF5 - Kebijakan Sosial\nF6 - Teknologi\nF7 - Gambaran Kota-kota kekaisaran\nF8 - Progres Kemenangan\nF9 - Gambaran Statistik kekaisaran\nF10 - Gambaran Sumber Daya kekaisaran\nF11 - Simpan kilat\nF12 - Muat kilat
 Ctrl-R - Toggle tile resource display\nCtrl-Y - Toggle tile yield display\nCtrl-O - Game options\nCtrl-S - Save game\nCtrl-L - Load game = Ctrl-R - Perlihatkan sumber daya daerah\nCtrl-Y - Perlihatkan penghasilan daerah\nCtrl-O - Opsi gim\nCtrl-S - Simpan gim\nCtrl-L - Muat gim
 
- # Requires translation!
 World Screen = Layar Dunia
- # Requires translation!
 This is where you spend most of your time playing Unciv. See the world, control your units, access other screens from here. = Di sinilah tempat di mana kamu akan menghabiskan sebagian besar waktumu saat bermain Unciv. Lihatlah dunia, perintahkan unitmu, dan akses layer-layar lainnya dari sini.
- # Requires translation!
 ①: The menu button - civilopedia, save, load, options... = ①: Tombol menu - civilopedia, simpan, muat, opsi...
- # Requires translation!
 ②: The player/nation whose turn it is - click for diplomacy overview. = ②: Giliran pemain/bangsa tertentu - tekan untuk melihat gambaran diplomasi.
- # Requires translation!
 ③: The Technology Button - shows the tech tree which allows viewing or researching technologies. = ③: Tombol Teknologi - menunjukkan cabang-cabang teknologi yang bisa digunakan untuk melihat atau meriset teknologi.
- # Requires translation!
 ④: The Social Policies Button - shows enacted and selectable policies, and with enough culture points you can enact new ones. = ④: Tombol Kebijakan Sosial - menunjukkan kebijakan yang berlaku atau dapat dipilih, dengan syarat poin kebudayaan yang cukup
- # Requires translation!
 ⑤: The Diplomacy Button - shows the diplomacy manager where you can talk to other civilizations. = ⑤: Tombol Diplomasi - menunjukkan pengelola diplomasi di mana kamu bisa bercakap-cakap dengan peradaban lain.
- # Requires translation!
 ⑥: Unit Action Buttons - while a unit is selected its possible actions appear here. = ⑥:  Tombol Tindakan Unit - ketika unit dipilih, tindakan-tindakan yang bisa dilakukan dapat dilihat di sini.
- # Requires translation!
 ⑦: The unit/city info pane - shows information about a selected unit or city. = ⑦: Panel info unit/kota - menunjukkan informasi tentang unit atau kota yang dipilih.
- # Requires translation!
 ⑧: The name (and unit icon) of the selected unit or city, with current health if wounded. = ⑧: Nama (dan ikon unit) dari unit atau kota yang terpilih, dengan kondisi darahnya saat ini jika terluka.
- # Requires translation!
 ⑨: The arrow buttons allow jumping to the next/previous unit. = ⑨: Tombol panah dapat digunakan untuk melompat ke unit selanjutnya/sebelumnya.
- # Requires translation!
 ⑩: For a selected unit, its promotions appear here, and clicking leads to the promotions screen for that unit. = ⑩: Untuk unit yang dipilih, promosinya dapat dilihat di sini. Dengan menekannya, kamu dapat menuju ke layer promosi untuk unit tersebut.
- # Requires translation!
 ⑪: Remaining/per turn movement points, strength and experience / XP needed for promotion. For cities, you get its combat strength. = ⑪: Poin gerakan tersisa/giliran, kekuatan dan pengalaman/XP yang diperlukan untuk promosi. Untuk kota, kamu dapat melihat kekuatan tempurnya.
- # Requires translation!
 ⑫: This button closes the selected unit/city info pane. = ⑫: Tombol ini menutup panel unit/kota yang dipilih.
- # Requires translation!
 ⑬: This pane appears when you order a uint to attack an enemy. On top are attacker and defender with their respective base strengths. = ⑬: Panel ini muncul ketika kamu memerintahkan sebuah unit untuk menyerang musuh. Di atas dapat dilihat kekuatan unit yang menyerang dan bertahan.
- # Requires translation!
 ⑭: Below that are strength boni or mali and health bars projecting before / after the attack. = ⑭: Di bawah ada kekuatan unit yang menyerang atau bertahan dan batang darah terproyeksi sebelum dan sesudah serangan.
- # Requires translation!
 ⑮: The Attack Button - let blood flow! = ⑮: Tombol Serangan - hiyaaa!
- # Requires translation!
 ⑯: The minimap shows an overview over the world, with known cities, terrain and fog of war. Clicking will position the main map. = ⑯: Peta mini menunjukkan gambaran dunia, dengan kota-kota yang sudah diketahui, medan, dan kabut perang. Menekannya akan mengganti posis peta utama.
- # Requires translation!
 ⑰: To the side of the minimap are display feature toggling buttons - tile yield, worked indicator, show/hide resources. These mirror setting on the options screen and are hidden if you deactivate the minimap. = ⑰: Di sisi peta mini terdapat tombol peralihan fitur tampilan - penghasilan daerah, indikator pengerjaan, perlihatkan/sembunyikan sumber daya. Setelan cermin di layar opsi disembunyikan jika kamu tidak mengaktifkan peta mini.
- # Requires translation!
 ⑱: Tile information for the selected hex - current or potential yield, terrain, effects, present units, city located there and such. = ⑱: Informasi daerah untuk heks yang dipilih - potensi penghasilan atau penghasilan terkini, medan, efek, unit terkini, adanya kota, dan sebagainya.
- # Requires translation!
 ⑲: Notifications - what happened during the last 'next turn' phase. Some are clickable to show a relevant place on the map, some even show several when you click repeatedly. = ⑲: Notifikasi - apa yang terjadi selama fase giliran terakhir. Beberapa dapat ditekan untuk menunjukkan tempat yang bersangkutan di peta, beberapa dari itu dapat menunjukkan beberapa tempat ketika ditekan beberapa kali.
- # Requires translation!
 ⑳: The Next Turn Button - unless there are things to do, in which case the label changes to 'next unit', 'pick policy' and so on. = ⑳: Tombol Giliran Selanjutnya - kalau ada hal yang bisa dilakukan, tulisannya akan berganti menjadi 'unit selanjutnya', 'pilih kebijakan', dan seterusnya.
- # Requires translation!
 ⓐ: The overview button leads to the empire overview screen with various tabs (the last one viewed is remembered) holding vital information about the state of your civilization in world. = ⓐ: Tombol gambaran akan menunjukkan layar gambaran kekaisaran dengan berbagai tab (tab terakhir yang dilihat akan diingat) yang menyimpan berbagai informasi vital tentang keadaan peradabanmu di dunia.
- # Requires translation!
 ⓑ: The culture icon shows accumulated culture and culture needed for the next policy - in this case, the exclamation mark tells us a next policy can be enacted. Clicking is another way to the policies manager. = Ikon budaya menunjukkan jumlah budaya yang terakumulasi dan budaya yang diperlukan untuk kebijakan selanjutnya - dalam hal ini, tanda seru memberitahu kita bahwa kebijakan baru dapat ditetapkan. Menekannya adalah salah satu cara lain untuk menuju pengelola kebijakan. 
- # Requires translation!
 ⓒ: Your known strategic resources are displayed here with the available (usage already deducted) number - click to go to the resources overview screen. = ⓒ: Sumber daya yang kamu ketahui akan ditampilkan di sini dengan jumlah yang tersedia (jumlah terpakai sudah termasuk) - tekan untuk menuju ke layar gambaran sumber daya.
- # Requires translation!
 ⓓ: Happiness/unhappiness balance and either golden age with turns left or accumulated happines with amount needed for a golden age is shown next to the smiley. Clicking also leads to the resources overview screen as luxury resources are a way to improve happiness. = ⓓ: Keseimbangan kebahagiaan/ketidakbahagiaan dan masa kejayaan dengan jumlah giliran tersisa atau jumlah giliran yang diperlukan untuk masa kejayaan ditampilkan di samping senyuman. Menekannya akan mengantarmu juga ke layar gambaran sumber daya karena barang-barang mewah juga adalah salah satu cara untuk meningkatkan kebahagiaan.
- # Requires translation!
 ⓔ: The science icon shows the number of science points produced per turn. Clicking leads to the technology tree. = ⓔ: Ikon ilmu pengetahuan menunjukkan jumlah poin ilmu pengetahuan yang dihasilkan tiap giliran. Menekannya akan mengantarmu ke layar cabang-cabang teknologi.
- # Requires translation!
 ⓕ: Number of turns played with translation into calendar years. Click to see the victory overview. = ⓕ: Jumlah giliran yang diterjemahkan menjadi tahun dalam kalender. Tekan untuk melihat gambaran kemenangan.
- # Requires translation!
 ⓖ: The number of gold coins in your treasury and income. Clicks lead to the Stats overview screen. = ⓖ: Jumlah koin emas di perbendaharaanmu dan pemasukanmu. Tekan untuk melihat layar gambaran statistik.
- # Requires translation!
 ⓧ: In the center of all this - the world map! Here, the "X" marks a spot outside the map. Yes, unless the wrap option was used, Unciv worlds are flat. Don't worry, your ships won't fall off the edge. = Di tengah semua ini - peta dunia! Di sini, "X" berarti tanda di luar peta. Ya, kecuali opsi dunia gabungan digunakan, dunia Unciv datar. Jangan takut, kapal-kapalmu tidak akan jatuh di ujungnya.
- # Requires translation!
 ⓨ: By the way, here's how an empire border looks like - it's in the national colours of the nation owning the territory. = ⓨ: Omong-omong, seperti inilah tampilan perbatasan kekaisaranmu - warnanya sesuai dengan bangsa yang memilikinya.
- # Requires translation!
 ⓩ: And this is the red targeting circle that led to the attack pane back under ⑬. = ⓩ: Dan inilah lingkaran target merah yang akan memunculkan panel di poin ⑬.
- # Requires translation!
 What you don't see: The phone/tablet's back button will pop the question whether you wish to leave Unciv and go back to Real Life. On desktop versions, you can use the ESC key. = Yang kamu tidak lihat: Tombol kembali gawaimu akan memunculkan pertanyaan apakah kamu ingin keluar dari Unciv dan kembali ke kehidupan nyata. Pada versi desktop, kamu bisa menggunakan tombol ESC.
 
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index d4a0852111..3e6899b587 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -3552,7 +3552,6 @@ Cover II = Copertura II
 March = Marcia
 
 Mobility = Mobilità
-+[amount] Movement = +[amount] Movimento
 
 Sentry = Sentinella
 
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index 15b934f534..fcc97192fc 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -3771,8 +3771,6 @@ Cover II = 援護 II
 March = 行軍
 
 Mobility = 機動力
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = 歩哨
 
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 6f93fdfa60..336c693c5c 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -3536,7 +3536,6 @@ Cover II = 엄폐 II
 March = 행군
 
 Mobility = 기동성
-+[amount] Movement = 행동력 +[amount]
 
 Sentry = 감시
 
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index d8e00f12f6..8591f69dc8 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -5829,8 +5829,6 @@ March =
 
  # Requires translation!
 Mobility = 
- # Requires translation!
-+[amount] Movement = 
 
  # Requires translation!
 Sentry = 
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index 5fe05de6af..84e285605e 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -5903,8 +5903,6 @@ March =
 
  # Requires translation!
 Mobility = 
- # Requires translation!
-+[amount] Movement = 
 
  # Requires translation!
 Sentry = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index 4e69f9384b..c43dd74ee0 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -5762,8 +5762,6 @@ March =
 
  # Requires translation!
 Mobility = 
- # Requires translation!
-+[amount] Movement = 
 
  # Requires translation!
 Sentry = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index 71c44e6e3b..2d5d2be3f7 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -5759,8 +5759,6 @@ March =
 
  # Requires translation!
 Mobility = 
- # Requires translation!
-+[amount] Movement = 
 
  # Requires translation!
 Sentry = 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index 865296bc75..e2ab0ed4f1 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -3812,8 +3812,6 @@ Cover II = Obrona II
 March = Marsz
 
 Mobility = Mobilność
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = Strażnik
 
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index 85ce1c8d96..f86fc635f0 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -5179,8 +5179,6 @@ Cover II = Cobertura II
 March = Marcha
 
 Mobility = Mobilidade
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = Sentinela
 
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index 076fb5e5e2..da00400d42 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -5457,8 +5457,6 @@ Cover II =
 March = Marș
 
 Mobility = Mobilitate
- # Requires translation!
-+[amount] Movement = 
 
  # Requires translation!
 Sentry = 
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index c973556da6..cf847ddac2 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -3552,7 +3552,6 @@ Cover II = Укрытие II
 March = Марш
 
 Mobility = Мобильность
-+[amount] Movement = +[amount] к передвижению
 
 Sentry = Караул
 
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 54a23d1f01..c2e57d356c 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -3652,8 +3652,6 @@ Cover II = 隐蔽II级
 March = 长途行军
 
 Mobility = 机动能力
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = 警戒能力
 
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index ea4f97b411..1f3741d73c 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -3609,8 +3609,6 @@ Cover II = Cobertura II
 March = Marcha
 
 Mobility = Movilidad
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = Vigilar
 
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index 7e8b68b4af..441379b1e8 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -3562,7 +3562,6 @@ Cover II = Skydd II
 March = Marsch
 
 Mobility = Rörlighet
-+[amount] Movement = +[amount] Förflyttning
 
 Sentry = Spejare
 
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index 781461d929..2866d53db3 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -3775,8 +3775,6 @@ Cover II = 隱蔽II級
 March = 長途行軍
 
 Mobility = 機動能力
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = 警戒能力
 
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index 8f9decbff7..03b70c3836 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -3703,8 +3703,6 @@ Cover II = Sığınak 2
 March = Yürüyüş
 
 Mobility = Hareketlilik 
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = Nöbetçi 
 
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index d9974ae964..9aff87c51a 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -3790,8 +3790,6 @@ Cover II = Схов II
 March = Похід
 
 Mobility = Мобільність
- # Requires translation!
-+[amount] Movement = 
 
 Sentry = Чати
 
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index 705b244869..2b027ae81f 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -7,7 +7,7 @@ Turkish = 92
 Ukrainian = 90
 French = 90
 Portuguese = 45
-Indonesian = 91
+Indonesian = 96
 Finnish = 54
 Malay = 19
 Spanish = 96
@@ -18,7 +18,7 @@ Lithuanian = 22
 Romanian = 36
 Simplified_Chinese = 94
 Bulgarian = 25
-Korean = 97
+Korean = 98
 Persian_(Pinglish-DIN) = 23
 Japanese = 90
 English = 1
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index de8583028f..408da1b339 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.4.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 588
-    const val appVersion = "3.15.7"
+    const val appCodeNumber = 589
+    const val appVersion = "3.15.8"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index f43a37710c..f1a30d64d5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,14 @@
+## 3.15.8
+
+By xlenstra:
+- Made eras more moddable
+- Updated and generalized more promotions 
+- Added Privateer unit; updated Coastal Raider promotion 
+
+By SomeTroglodyte:
+- Fix mod custom maps unavailable when no local ones exist 
+- Spruced up Civilopedia - phase 3 - Interface, flavour text, new Tutorial 
+
 ## 3.15.7-announcementTest
 
 I'm checking if this information gets to the Github release and the Discord announcements