diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index e513b4dfb7..aa22ef1f4a 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -828,6 +828,8 @@ Waiting for other players... = Esperando por outros jogadores...
 Waiting for [civName]... = 
 in = em
 Next turn = Próximo turno
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] pronto?
 1 turn = 1 turno
 [numberOfTurns] turns = [numberOfTurns] turnos
@@ -6575,6 +6577,8 @@ Requires at least [amount] population = Requer uma população de ao menos [amou
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -6595,6 +6599,9 @@ Slinger = Lançador
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Barcos de trabalho
 Cannot enter ocean tiles until Astronomy = Não pode entrar o terreno 'oceano' até Astronomia
 May create improvements on water resources = Pode criar melhorias em recursos aquáticos
@@ -6610,6 +6617,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Arqueiro de Biga
 No defensive terrain bonus = Nenhum bonus de defesa do terreno
 Rough terrain penalty = Penalidade de terreno acidentado
@@ -6636,6 +6646,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Cavaleiro
 Can move after attacking = Pode se mover após atacar
 
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index bfdc74d4fd..27ccafc00a 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -830,6 +830,8 @@ Waiting for other players... = Изчакване на други играчи..
 Waiting for [civName]... = 
 in = в
 Next turn = Следващ Ход
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] готов?
 1 turn = 1 ход
 [numberOfTurns] turns = [numberOfTurns] ходове
@@ -7861,6 +7863,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -7888,6 +7892,9 @@ Slinger =
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -7908,6 +7915,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
  # Requires translation!
@@ -7941,6 +7951,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
  # Requires translation!
 Horseman = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 38273c5a95..49ced83d5b 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -669,6 +669,8 @@ Waiting for other players... = Čekáme na ostatní hráče...
 Waiting for [civName]... = 
 in = za
 Next turn = Další tah
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] připraven?
 1 turn = 1 tah
 [numberOfTurns] turns = [numberOfTurns] tahy(ů) 
@@ -5039,6 +5041,8 @@ Excess Food converted to Production when under construction = Přebytek jídla s
 Requires at least [amount] population = Vyžaduje alespoň [amount] obyvatele
 
 May upgrade to [unit] through ruins-like effects = Lze vylepšit na [unit] pomocí efektu ruin a podobných
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
 This is your basic, club-swinging fighter. = Toto je základní, kyjem máchající bojovník.
 
@@ -5058,6 +5062,9 @@ Slinger = Prakovník
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Pracovní člun
 Cannot enter ocean tiles until Astronomy = Nelze vyplout na oceán před objevem Astronomie
 May create improvements on water resources = Může vybudovat vylepšení na vodních políčkách se surovinami
@@ -5070,6 +5077,9 @@ Quinquereme = Quinqueréma
 
 Dromon = Dromón
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Lučištník ve válečném vozu
 No defensive terrain bonus = Žádný terénní obranný bonus
 Rough terrain penalty = Penalizace v obtížném terénu
@@ -5091,6 +5101,9 @@ Can only attack [unitType] units = Může útočit pouze na [unitType]
 
 Pictish Warrior = Piktský válečník
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Jízda
 Can move after attacking = Může se pohybovat po útoku
 
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index 8b23cdac84..89f6be20a1 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -664,6 +664,8 @@ Waiting for other players... = Wachten op andere spelers...
 Waiting for [civName]... = 
 in = in
 Next turn = Volgende beurt
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] klaar?
 1 turn = 1 beurt
 [numberOfTurns] turns = [numberOfTurns] beurten
@@ -6723,6 +6725,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -6745,6 +6749,9 @@ Slinger =
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -6765,6 +6772,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
 No defensive terrain bonus = Geen defensiefe terreinsbonussen
@@ -6796,6 +6806,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Ruiter
 Can move after attacking = Kan zich verplaatsen na het aanvallen
 
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index 6c15713b9d..08da31324d 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -1222,6 +1222,8 @@ in =
  # Requires translation!
 Next turn = 
  # Requires translation!
+Move automated units = 
+ # Requires translation!
 [currentPlayerCiv] ready? = 
  # Requires translation!
 1 turn = 
@@ -8633,6 +8635,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -8660,6 +8664,9 @@ Slinger =
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -8680,6 +8687,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
  # Requires translation!
@@ -8713,6 +8723,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
  # Requires translation!
 Horseman = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index e9a9875361..f02068aa52 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -1093,6 +1093,8 @@ in =
  # Requires translation!
 Next turn = 
  # Requires translation!
+Move automated units = 
+ # Requires translation!
 [currentPlayerCiv] ready? = 
  # Requires translation!
 1 turn = 
@@ -8515,6 +8517,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -8542,6 +8546,9 @@ Slinger =
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -8562,6 +8569,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
  # Requires translation!
@@ -8595,6 +8605,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
  # Requires translation!
 Horseman = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index 0875e930dd..3df8aca4ee 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -793,6 +793,8 @@ Waiting for [civName]... =
  # Requires translation!
 in = 
 Next turn = Seuraava vuoro
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] valmis?
 1 turn = 1 vuoro
 [numberOfTurns] turns = [numberOfTurns] vuorossa
@@ -6764,6 +6766,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -6788,6 +6792,9 @@ Slinger = Ritsamies
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -6808,6 +6815,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
  # Requires translation!
@@ -6840,6 +6850,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
  # Requires translation!
 Horseman = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 250ca89826..503b3680ab 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -708,6 +708,8 @@ Waiting for other players... = En attente des autres joueurs...
 Waiting for [civName]... = 
 in = dans
 Next turn = Prochain tour
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] pret ?
 1 turn = 1 tour
 [numberOfTurns] turns = [numberOfTurns] tours
@@ -5765,6 +5767,8 @@ Requires at least [amount] population = Nécessite au moins [amount] de populati
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -5785,6 +5789,9 @@ Slinger = Frondeur
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Bateau-atelier
 Cannot enter ocean tiles until Astronomy = Ne peut pas aller sur les cases d'océan avant la découverte de l'astronomie
 May create improvements on water resources = Crée des aménagements de ressources maritimes
@@ -5800,6 +5807,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Archer sur char
 No defensive terrain bonus = Aucun bonus de terrain défensif
 Rough terrain penalty = Pénalité en terrain difficile
@@ -5826,6 +5836,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Cavalier
 Can move after attacking = Peut se déplacer après avoir attaqué
 
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index d1c9e86203..7b531a4ac2 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -651,6 +651,8 @@ Waiting for other players... = Warte auf andere Spieler...
 Waiting for [civName]... = Warte auf [civName]...
 in = in
 Next turn = Nächste Runde
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] bereit?
 1 turn = Eine Runde
 [numberOfTurns] turns = [numberOfTurns] Runden
@@ -4734,6 +4736,8 @@ Excess Food converted to Production when under construction = Überschüssige Na
 Requires at least [amount] population = Benötigt mindestens [amount] Bevölkerung
 
 May upgrade to [unit] through ruins-like effects = Kann durch Ruineneffekte zu [unit] aufrüsten
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
 This is your basic, club-swinging fighter. = Dies ist ein einfacher, keulenschwingender Kämpfer.
 
@@ -4752,6 +4756,9 @@ Slinger = Schleuderer
 
 Atlatlist = Speerschleuderer
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Arbeitsboote
 Cannot enter ocean tiles until Astronomy = Ozeanfelder können nicht befahren werden bis Astronomie erforscht ist
 May create improvements on water resources = Kann Verbesserungen auf Ressourcen im Wasser bauen
@@ -4764,6 +4771,9 @@ Quinquereme = Quinquereme
 
 Dromon = Dromone
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Streitwagen-Bogenschütze
 No defensive terrain bonus = Kein geländeabhängiger Verteidigungsbonus
 Rough terrain penalty = Im Nachteil auf rauem Gelände
@@ -4785,6 +4795,9 @@ Can only attack [unitType] units = Kann nur [unitType] Einheiten angreifen
 
 Pictish Warrior = Piktischer Krieger
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Reiter
 Can move after attacking = Kann sich nach dem Angriff bewegen
 
diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties
index 968f3c8ec5..a29e114eca 100644
--- a/android/assets/jsons/translations/Greek.properties
+++ b/android/assets/jsons/translations/Greek.properties
@@ -977,6 +977,8 @@ Waiting for [civName]... =
 in = 
 Next turn = Επόμενος γύρος
  # Requires translation!
+Move automated units = 
+ # Requires translation!
 [currentPlayerCiv] ready? = 
  # Requires translation!
 1 turn = 
@@ -8044,6 +8046,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -8070,6 +8074,9 @@ Slinger =
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -8090,6 +8097,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
  # Requires translation!
@@ -8123,6 +8133,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
  # Requires translation!
 Horseman = 
 Can move after attacking = Μπορεί να κινηθεί αφού επιτεθεί
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index d3b353b643..dd0f3193b0 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -817,6 +817,8 @@ Waiting for other players... = Várakozás a többi játékosra...
 Waiting for [civName]... = 
 in = benne
 Next turn = Következő kör
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] kész?
 1 turn = 1 kör
 [numberOfTurns] turns = [numberOfTurns] kör
@@ -6457,6 +6459,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -6477,6 +6481,9 @@ Slinger = Parittyás
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Munkahajó
 Cannot enter ocean tiles until Astronomy = Csillagászat nélkül nem léphet óceán területre
 May create improvements on water resources = Vízi erőforrásokat használhat ki
@@ -6492,6 +6499,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Szerekes íjász
 No defensive terrain bonus = Nincs védelmi bónusz terepből
 Rough terrain penalty = Nehéz terepen büntetés
@@ -6516,6 +6526,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Lovas
 Can move after attacking = Támadás után még mozoghat
 
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 807f4cbc66..052fcdc446 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -319,7 +319,6 @@ Perlin = Perlin
 Continents = Benua
 Four Corners = Empat Penjuru
 Archipelago = Kepulauan
- # Requires translation!
 Inner Sea = Laut Pedalaman
 Number of City-States = Jumlah Negara-Kota
 One City Challenge = Tantangan Satu(1) Kota
@@ -445,15 +444,10 @@ Resign = Menyerah
 Are you sure you want to resign? = Apakah kamu yakin kamu ingin menyerah?
 You can only resign if it's your turn = Kamu hanya bisa menyerah jika sekarang giliranmu
 [civName] resigned and is now controlled by AI = [civName] menyerah dan digantikan oleh AI
- # Requires translation!
 Last refresh: [time] [timeUnit] ago = Terakhir disegarkan: [time] [timeUnit] yang lalu
- # Requires translation!
 Current Turn: [civName] since [time] [timeUnit] ago = Giliran Saat Ini: [civName] sejak [time] [timeUnit] yang lalu
- # Requires translation!
 Minutes = Menit
- # Requires translation!
 Hours = Jam
- # Requires translation!
 Days = Hari
 
 # Save game menu
@@ -654,10 +648,11 @@ A Great Person joins you! = Ada Orang Hebat yang bergabung denganmu!
 
 Working... = Sedang dikerjakan...
 Waiting for other players... = Menunggu pemain lain...
- # Requires translation!
 Waiting for [civName]... = Menunggu [civName]...
 in = dalam
 Next turn = Giliran selanjutnya
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] siap?
 1 turn = 1 giliran
 [numberOfTurns] turns = [numberOfTurns] giliran
@@ -1144,22 +1139,15 @@ Holy City: = Kota Suci:
 Cities following this religion: = Kota-kota pengikut agama ini: 
 Click an icon to see the stats of this religion = Klik ikon untuk melihat statistik agama tersebut
 Religion: Off = Agama: Dimatikan
- # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = Iman minimal yang diperlukan untuk\n[Great Prophet] selanjutnya:
- # Requires translation!
 Religions founded: = Agama didirikan:
- # Requires translation!
 Religious status: = Status agama:
 
- # Requires translation!
 None = Tidak ada
 Pantheon = Kepercayaan
- # Requires translation!
 Founding religion = Agama pendiri
 Religion = Agama
- # Requires translation!
 Enhancing religion = Agama penguat
- # Requires translation!
 Enhanced religion = Agama diperkuat
 
 # Terrains
@@ -4332,7 +4320,6 @@ Uluru = Uluru
 
 Farm = Pertanian
 Can also be built on tiles adjacent to fresh water = Dapat dibangun juga pada daerah yang bersebelahan dengan air tawar
- # Requires translation!
 [stats] from [tileFilter] tiles = [stats] dari daerah [tileFilter]
 
 Lumber mill = Pabrik kayu
@@ -4393,7 +4380,6 @@ Customs house = Rumah cukai
 Holy site = Situs agama
 
 Citadel = Benteng
- # Requires translation!
 Adjacent enemy units ending their turn take [amount] damage = Unit musuh bersebelahan yang mengakhiri giliran mereka mendapatkan [amount] kerusakan
 Can be built just outside your borders = Hanya bisa dibangun tepat di luar perbatasanmu
 Constructing it will take over the tiles around it and assign them to your closest city = Daerah yang berada di sekitar pembangunan ini akan dipakai dan diserahkan ke kota terdekat
@@ -4401,7 +4387,6 @@ Constructing it will take over the tiles around it and assign them to your close
 Moai = Moai
 
 Terrace farm = Sawah bersengkedan
- # Requires translation!
 [stats] on [tileFilter] tiles = [stats] di daerah [tileFilter]
 
 Polder = Polder
@@ -4751,6 +4736,8 @@ Excess Food converted to Production when under construction = Kelebihan Makanan
 Requires at least [amount] population = Membutuhkan setidaknya [amount] populasi
 
 May upgrade to [unit] through ruins-like effects = Dapat meningkat menjadi [unit] melalui pengaruh reruntuhan kuno 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
 This is your basic, club-swinging fighter. = Inilah unit pejuang paling dasar yang menyerang dengan mengayunkan pentungan
 
@@ -4769,6 +4756,9 @@ Slinger = Pengumban
 
 Atlatlist = Pelempar Atlatl
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Kapal Pekerja
 Cannot enter ocean tiles until Astronomy = Tidak dapat memasuki daerah samudra hingga Astronomi
 May create improvements on water resources = Dapat membuat peningkatan di sumber daya dalam air
@@ -4781,6 +4771,9 @@ Quinquereme = Quinquereme
 
 Dromon = Dromon
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Pemanah Berkereta Kuda
 No defensive terrain bonus = Tidak ada bonus perlindungan medan
 Rough terrain penalty = Penalti di medan kasar
@@ -4802,6 +4795,9 @@ Can only attack [unitType] units = Hanya dapat menyerang unit [unitType]
 
 Pictish Warrior = Pejuang Pikt
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Pasukan Berkuda
 Can move after attacking = Dapat bergerak setelah menyerang 
 
@@ -5061,9 +5057,7 @@ Connecting your cities to the capital by roads\n  will generate gold via the tra
 
 Victory Types = Jenis Kemenangan
 Once you’ve settled your first two or three cities you’re probably 100 to 150 turns into the game.\nNow is a good time to start thinking about how, exactly, you want to win – if you haven’t already. = Ketika kamu telah mendirikan dua atau tiga kota pertamamu, kemungkinan kamu telah 100 sampai 150 giliran dalam game ini.\nSekarang waktu yang baik untuk memikirkan dengan cara apa kamu mau menang – jika kamu belum memikirkannya.
- # Requires translation!
 There are four ways to win in Unciv. They are:\n - Cultural Victory: Complete 5 Social Policy Trees and build the Utopia Project\n - Domination Victory: Survive as the last civilization\n - Science Victory: Be the first to construct a spaceship to Alpha Centauri\n - Diplomatic Victory: Build the United Nations and win the vote = Ada empat cara untuk menang di Unciv. Mereka adalah:\n - Kemenangan Kebudayaan: Selesaikan 5 Cabang Kebijakan dan bangun Proyek Utopia\n - Kemenangan Penaklukan: Bertahan sebagai peradaban terakhir\n - Kemenangan Ilmu Pengetahuan: Jadi yang pertama untuk membangun pesawat angkasa ke Alpha Centauri\n - Kemenangan Diplomatik: Bangun Perserikatan Bangsa-Bangsa dan jadilah pemenang pemungutan suara
- # Requires translation!
 So to sum it up, these are the basics of Unciv – Found a prosperous first city, expand slowly to manage happiness, and set yourself up for the victory condition you wish to pursue.\nObviously, there is much more to it than that, but it is important not to jump into the deep end before you know how to swim. = Kesimpulannya, ini adalah dasar Unciv – Temukan kota pertama yang makmur, jangan buru-buru berekspansi untuk mengendalikan kebahagiaan, dan siapkan diri untuk kemenangan yang ingin diraih.\nTentu, masih ada lebih banyak dari itu saja, tetapi penting untuk tidak menyelam terlalu dalam sebelum kamu tahu caranya untuk berenang.
 
 Enemy City = Kota Musuh
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index f778e058a4..691647cbdf 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -652,6 +652,8 @@ Waiting for other players... = In attesa degli altri giocatori...
 Waiting for [civName]... = In attesa di [civName]...
 in = tra
 Next turn = Fine turno
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] pronto?
 1 turn = 1 turno
 [numberOfTurns] turns = [numberOfTurns] turni
@@ -4736,6 +4738,8 @@ Excess Food converted to Production when under construction = Il Cibo in eccesso
 Requires at least [amount] population = Richiede almeno [amount] abitanti
 
 May upgrade to [unit] through ruins-like effects = Può aggiornarsi a [unit] tramite gli effetti delle rovine
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
 This is your basic, club-swinging fighter. = Questo è il tuo combattente con mazza di tutti i giorni.
 
@@ -4754,6 +4758,9 @@ Slinger = Fromboliere
 
 Atlatlist = Lanciatore di atlatl
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Chiatta
 Cannot enter ocean tiles until Astronomy = Può entrare nell'oceano solo dopo aver scoperto l'Astronomia
 May create improvements on water resources = Può costruire miglioramenti sulle risorse acquatiche
@@ -4766,6 +4773,9 @@ Quinquereme = Quinquereme
 
 Dromon = Dromone
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Arciere su carro
 No defensive terrain bonus = Nessun bonus difensivo su terreno
 Rough terrain penalty = Penalità su terreno accidentato
@@ -4787,6 +4797,9 @@ Can only attack [unitType] units = Può attaccare solo le unità [unitType]
 
 Pictish Warrior = Guerriero pitto
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Guerriero a cavallo
 Can move after attacking = Può muoversi dopo aver attaccato
 
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index 80fad38b6e..e2abe421fc 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -766,6 +766,8 @@ Waiting for other players... = 他のプレイヤーを待っています…
 Waiting for [civName]... = [civName]を待っています…
 in = 建設
 Next turn = 次のターン
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] レディー？
 1 turn = 1ターン
 [numberOfTurns] turns = [numberOfTurns]ターン
@@ -5779,6 +5781,8 @@ Requires at least [amount] population = 最低でも人口が[amount]必要
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -5799,6 +5803,9 @@ Slinger = 投石兵
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = 作業船
 Cannot enter ocean tiles until Astronomy = 天文学まで海上タイルに進出できない
 May create improvements on water resources = 海にある資源の上にタイル施設が作れる
@@ -5814,6 +5821,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = 戦車弓兵
 No defensive terrain bonus = 地形の防御ボーナスなし
 Rough terrain penalty = 粗い地形でのペナルティ
@@ -5840,6 +5850,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = 騎兵
 Can move after attacking = 攻撃後に移動可能
 
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index a9953cd8ec..07d9fd0b91 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -718,6 +718,8 @@ Waiting for other players... = 다른 플레이어를 기다리는 중...
 Waiting for [civName]... = 
 in = 의 완성까지
 Next turn = 다음 턴
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] 준비되었습니까?
 1 turn = 1 턴
 [numberOfTurns] turns = [numberOfTurns] 턴
@@ -5285,6 +5287,8 @@ Requires at least [amount] population = 인구 [amount] 이상부터 생산 가
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -5305,6 +5309,9 @@ Slinger = 투석병
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = 작업선
 Cannot enter ocean tiles until Astronomy = 천문학 연구 전까지 대양 항해 불가능
 May create improvements on water resources = 해양 자원에 시설 건설 가능
@@ -5320,6 +5327,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = 궁전차
 No defensive terrain bonus = 지형에 의한 방어 보너스 없음
 Rough terrain penalty = 험지 이동 페널티
@@ -5342,6 +5352,9 @@ Can only attack [unitType] units = [unitType]만 공격 가능
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = 기마병
 Can move after attacking = 공격 후 이동 가능
 
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index 36c451c97c..ad72f200d7 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -830,6 +830,8 @@ Waiting for [civName]... =
 in = į
 Next turn = Kitas posūkis
  # Requires translation!
+Move automated units = 
+ # Requires translation!
 [currentPlayerCiv] ready? = 
  # Requires translation!
 1 turn = 
@@ -7897,6 +7899,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -7924,6 +7928,9 @@ Slinger =
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -7944,6 +7951,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
  # Requires translation!
@@ -7977,6 +7987,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
  # Requires translation!
 Horseman = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index a867a02217..274177e839 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -994,6 +994,8 @@ Waiting for [civName]... =
 in = 
 Next turn = pusingan seterusnya
  # Requires translation!
+Move automated units = 
+ # Requires translation!
 [currentPlayerCiv] ready? = 
 1 turn = pusingan
  # Requires translation!
@@ -8018,6 +8020,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -8045,6 +8049,9 @@ Slinger =
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -8065,6 +8072,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
  # Requires translation!
@@ -8098,6 +8108,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
  # Requires translation!
 Horseman = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index 87955afcce..1f6bfd74bc 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -859,6 +859,8 @@ Waiting for [civName]... =
 in = Dāḵel
 Next turn = Nobat e ba’adi
  # Requires translation!
+Move automated units = 
+ # Requires translation!
 [currentPlayerCiv] ready? = 
  # Requires translation!
 1 turn = 
@@ -7893,6 +7895,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -7920,6 +7924,9 @@ Slinger =
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -7940,6 +7947,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
  # Requires translation!
@@ -7973,6 +7983,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
  # Requires translation!
 Horseman = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index 90d639bd0b..abd666dcc8 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -856,6 +856,8 @@ Waiting for [civName]... =
 in = Daakhel
 Next turn = Nobat e ba’adi
  # Requires translation!
+Move automated units = 
+ # Requires translation!
 [currentPlayerCiv] ready? = 
  # Requires translation!
 1 turn = 
@@ -7890,6 +7892,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -7917,6 +7921,9 @@ Slinger =
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
  # Requires translation!
 Work Boats = 
  # Requires translation!
@@ -7937,6 +7944,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
  # Requires translation!
 Chariot Archer = 
  # Requires translation!
@@ -7970,6 +7980,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
  # Requires translation!
 Horseman = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index dc1c1ab9af..817c29cad9 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -752,6 +752,8 @@ Waiting for other players... = Czekam na innych graczy...
 Waiting for [civName]... = 
 in = w
 Next turn = Następna tura 
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] gotowy?
 1 turn = 1 tura
 [numberOfTurns] turns = [numberOfTurns] tur
@@ -5837,6 +5839,8 @@ Requires at least [amount] population = Wymaga co najmniej [amount] populacji
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -5857,6 +5861,9 @@ Slinger = Procarz
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Kuter
 Cannot enter ocean tiles until Astronomy = Nie może wypłynąć na pole oceanu do momentu odblokowania Astronomii
 May create improvements on water resources = Może budować ulepszenia na surowcach wodnych
@@ -5872,6 +5879,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Łucznik Rydwanowy
 No defensive terrain bonus = Brak premii do obrony wynikających z terenu
 Rough terrain penalty = Kara za trudny teren
@@ -5896,6 +5906,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Konnica
 Can move after attacking = Może poruszać się po ataku
 
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index e03ff0d849..c5c635e9c6 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -751,6 +751,8 @@ Waiting for other players... = A esperar por outros jogadores...
 Waiting for [civName]... = 
 in = em
 Next turn = Proximo turno
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] pronto?
 1 turn = 1 turno
 [numberOfTurns] turns = [numberOfTurns] turnos
@@ -6209,6 +6211,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -6230,6 +6234,9 @@ Slinger = Lançador
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Barcos de trabalho
 Cannot enter ocean tiles until Astronomy = Não pode entrar o terreno 'oceano' até Astronomia
 May create improvements on water resources = Pode criar melhorias em recursos aquáticos
@@ -6245,6 +6252,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Arqueiro de Biga
 No defensive terrain bonus = Nenhum bonus de defesa do terreno
 Rough terrain penalty = Penalidade de terreno díficil
@@ -6271,6 +6281,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Cavaleiro
 Can move after attacking = Pode se mover após atacar
 
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index 54f230d5a7..9001bf7785 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -859,6 +859,8 @@ Waiting for [civName]... =
 in = în
 Next turn = Runda următoare
  # Requires translation!
+Move automated units = 
+ # Requires translation!
 [currentPlayerCiv] ready? = 
  # Requires translation!
 1 turn = 
@@ -7577,6 +7579,8 @@ Requires at least [amount] population =
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -7598,6 +7602,9 @@ Slinger = Om cu praștia
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Barcă de Lucru
 Cannot enter ocean tiles until Astronomy = Nu poate accesa celule de ocean înainte de a descoperi Astronomia
 May create improvements on water resources = Poate crea îmbunătățiri pe resurse acvatice
@@ -7613,6 +7620,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Arcaș în car
 No defensive terrain bonus = Niciun bonus defensiv de teren
 Rough terrain penalty = Penalizare pentru teren accidentat
@@ -7639,6 +7649,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Călăreț
 Can move after attacking = Poate să se deplaseze după ce a atacat
 
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index 139b485b65..9bb32a89aa 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -683,6 +683,8 @@ Waiting for other players... = Ожидание других игроков...
 Waiting for [civName]... = 
 in = через
 Next turn = Следующий ход
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] готов?
 1 turn = 1 ход
 [numberOfTurns] turns = Ходов: [numberOfTurns]
@@ -5189,6 +5191,8 @@ Excess Food converted to Production when under construction = Избыток е
 Requires at least [amount] population = Требуется как минимум [amount] населения
 
 May upgrade to [unit] through ruins-like effects = Может улучшиться до [unit] с помощью эффектов, похожих на руины.
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
 This is your basic, club-swinging fighter. = Это ваш базовый боец, размахивающий дубинкой.
 
@@ -5208,6 +5212,9 @@ Slinger = Пращник
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Рабочие Лодки
 Cannot enter ocean tiles until Astronomy = Для выхода в океан нужно открыть Астрономию
 May create improvements on water resources = Может создавать улучшения на водных ресурсах
@@ -5222,6 +5229,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Лучник на колеснице
 No defensive terrain bonus = Нет бонуса защиты от ландшафта
 Rough terrain penalty = Штраф грубой местности
@@ -5244,6 +5254,9 @@ Can only attack [unitType] units = Может атаковать только [u
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Всадник
 Can move after attacking = Может двигаться после атаки
 
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 3c052245da..513a78f207 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -651,6 +651,8 @@ Waiting for other players... = 等待其他玩家...
 Waiting for [civName]... = 等待[civName]...
 in = 完成需
 Next turn = 下一回合
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv]准备好了吗？
 1 turn = 1 回合
 [numberOfTurns] turns = [numberOfTurns] 回合
@@ -4734,6 +4736,8 @@ Excess Food converted to Production when under construction = 组建过程中富
 Requires at least [amount] population = 至少需要 [amount] 人口
 
 May upgrade to [unit] through ruins-like effects = 可在废墟中升级为[unit]
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
 This is your basic, club-swinging fighter. = 这是您基本的挥舞木棒的战士。
 
@@ -4752,6 +4756,9 @@ Slinger = 投石手
 
 Atlatlist = 投矛器战士
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = 工船
 Cannot enter ocean tiles until Astronomy = 研究出天文学之前不能进入海洋地块
 May create improvements on water resources = 可在水上资源建造设施（工船将被消耗掉）
@@ -4764,6 +4771,9 @@ Quinquereme = 五列桨战船
 
 Dromon = 德罗蒙战舰
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = 战车射手
 No defensive terrain bonus = 无地形防御力加成
 Rough terrain penalty = 崎岖地形惩罚
@@ -4785,6 +4795,9 @@ Can only attack [unitType] units = 只能攻击[unitType]单位
 
 Pictish Warrior = 皮克特战士
 
+ # Requires translation!
+Marauder = 
+
 Horseman = 骑手
 Can move after attacking = 攻击后可移动
 
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index 344c049bc6..58dadc9290 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -679,6 +679,8 @@ Waiting for other players... = Esperando a otros jugadores...
 Waiting for [civName]... = 
 in = en
 Next turn = Siguiente turno
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = ¿[currentPlayerCiv] listo?
 1 turn = 1 turno
 [numberOfTurns] turns = [numberOfTurns] turnos
@@ -5000,6 +5002,8 @@ Excess Food converted to Production when under construction = El exceso de ⁂Al
 Requires at least [amount] population = Requiere al menos [amount] de población
 
 May upgrade to [unit] through ruins-like effects = Puede mejorarse a [unit] a través de efectos de ruinas
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
 This is your basic, club-swinging fighter. = Este es tu basico, un luchador aficionado
 
@@ -5019,6 +5023,9 @@ Slinger = Hondero
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Barco de Trabajo
 Cannot enter ocean tiles until Astronomy = No puede entrar al océano hasta investigar Astronomía
 May create improvements on water resources = Puede crear mejoras en recursos acuáticos
@@ -5032,6 +5039,9 @@ Quinquereme = Quinquerreme
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Arquero a Carruaje
 No defensive terrain bonus = Sin bonus de defensa de terreno
 Rough terrain penalty = Penalización en terreno escabroso
@@ -5054,6 +5064,9 @@ Can only attack [unitType] units = Solo puede atacar unidades [unitType]
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Jinete
 Can move after attacking = Puede mover después de atacar
 
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index f28aa11afc..057d6cc13d 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -319,7 +319,6 @@ Perlin = Perlin
 Continents = Kontinenter
 Four Corners = Fyra hörnor
 Archipelago = Skärgård
- # Requires translation!
 Inner Sea = Innanhav
 Number of City-States = Antal Statsstater
 One City Challenge = Enstadsutmaning
@@ -445,15 +444,10 @@ Resign = Ge upp
 Are you sure you want to resign? = Är du säker på att du vill ge upp?
 You can only resign if it's your turn = Du kan bara ge upp om det är din tur
 [civName] resigned and is now controlled by AI = [civName] gav upp och styrs nu av en AI
- # Requires translation!
 Last refresh: [time] [timeUnit] ago = Senaste uppdatering: för [time] [timeUnit] sedan
- # Requires translation!
 Current Turn: [civName] since [time] [timeUnit] ago = Nuvarande tur: [civName] sedan [time] [timeUnit]
- # Requires translation!
 Minutes = Minuter
- # Requires translation!
 Hours = Timmar
- # Requires translation!
 Days = Dagar
 
 # Save game menu
@@ -654,10 +648,11 @@ A Great Person joins you! = En Stor Person går med dig!
 
 Working... = Arbetar...
 Waiting for other players... = Väntar på övriga spelare...
- # Requires translation!
 Waiting for [civName]... = Väntar på [civName]...
 in = om
 Next turn = Nästa drag
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] redo?
 1 turn = 1 drag
 [numberOfTurns] turns = [numberOfTurns] drag
@@ -1144,22 +1139,15 @@ Holy City: = Helig Stad:
 Cities following this religion: = Städer som följer denna religion:
 Click an icon to see the stats of this religion = Klicka på en ikon för att se statistiken för denna religionen
 Religion: Off = Religion: Av
- # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = Minsta tro som krävs för\nnästa [Great Prophet]:
- # Requires translation!
 Religions founded: = Stiftade Religioner:
- # Requires translation!
 Religious status: = Religionsstatus:
 
- # Requires translation!
 None = Ingen
 Pantheon = Panteon
- # Requires translation!
 Founding religion = Stifta Religion
 Religion = Religion
- # Requires translation!
 Enhancing religion = Förbättra Religion
- # Requires translation!
 Enhanced religion = Förbättrad Religion
 
 # Terrains
@@ -4332,7 +4320,6 @@ Uluru = Uluru
 
 Farm = Bondgård
 Can also be built on tiles adjacent to fresh water = Kan även byggas på rutor angränsande färskvatten
- # Requires translation!
 [stats] from [tileFilter] tiles = [stats] från [tileFilter]-rutor
 
 Lumber mill = Sågverk
@@ -4393,7 +4380,6 @@ Customs house = Tullhus
 Holy site = Helig Plats
 
 Citadel = Fästning
- # Requires translation!
 Adjacent enemy units ending their turn take [amount] damage = Angränsande fientliga enheter som avslutar sitt drag tar [amount] skada
 Can be built just outside your borders = Kan byggas precis utanför dina gränser
 Constructing it will take over the tiles around it and assign them to your closest city = Vid konstruktion kommer rutorna runt den att tas över och tilldelas den närmaste staden
@@ -4401,7 +4387,6 @@ Constructing it will take over the tiles around it and assign them to your close
 Moai = Moai
 
 Terrace farm = Terassbondgård
- # Requires translation!
 [stats] on [tileFilter] tiles = [stats] på [tileFilter]-rutor
 
 Polder = Polder
@@ -4751,6 +4736,8 @@ Excess Food converted to Production when under construction = Extra mat omvandla
 Requires at least [amount] population = Kräver minst [amount] befolkning
 
 May upgrade to [unit] through ruins-like effects = Kan uppgraderas till [unit] genom ruin-liknande effekter
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
 This is your basic, club-swinging fighter. = Det här är din vanliga, klubbsvingande kämpe.
 
@@ -4769,6 +4756,9 @@ Slinger = Slungare
 
 Atlatlist = Spjutslungare
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Arbetsbåtar
 Cannot enter ocean tiles until Astronomy = Kan inte gå in i havsrutor innan Astronomi
 May create improvements on water resources = Kan skapa förbättringar på vattenresurser
@@ -4781,6 +4771,9 @@ Quinquereme = Quinquerem
 
 Dromon = Dromon
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Vagnsskytt
 No defensive terrain bonus = Ingen försvarsbonus från terräng
 Rough terrain penalty = Avdrag för kuperad terräng
@@ -4802,6 +4795,9 @@ Can only attack [unitType] units = Kan endast anfalla [unitType]-enheter
 
 Pictish Warrior = Piktisk Krigare
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Ryttare
 Can move after attacking = Kan flytta efter anfall
 
@@ -5061,9 +5057,7 @@ Connecting your cities to the capital by roads\n  will generate gold via the tra
 
 Victory Types = Segertyper
 Once you’ve settled your first two or three cities you’re probably 100 to 150 turns into the game.\nNow is a good time to start thinking about how, exactly, you want to win – if you haven’t already. = När du grundat dina första två eller tre städer är du antagligen 100 till 150 drag in i spelet.\nNu är ett bra tillfälla att börja fundera på exakt hur du vill vinna - om du inte redan har det.
- # Requires translation!
 There are four ways to win in Unciv. They are:\n - Cultural Victory: Complete 5 Social Policy Trees and build the Utopia Project\n - Domination Victory: Survive as the last civilization\n - Science Victory: Be the first to construct a spaceship to Alpha Centauri\n - Diplomatic Victory: Build the United Nations and win the vote = Det finns fyra sätt att vinna Unciv. De är:\n - Kulturseger: Fullborda 5 Policyträd och bygg Utopiaprojektet\n - Domineringsseger: Överlev som sista civilisaton\n - Vetenskapsseger: Var den första att bygga ett rymdskepp till Alfa Centauri\n - Diplomatiseger: Bygg de Förenta Nationerna och vinn omröstningen
- # Requires translation!
 So to sum it up, these are the basics of Unciv – Found a prosperous first city, expand slowly to manage happiness, and set yourself up for the victory condition you wish to pursue.\nObviously, there is much more to it than that, but it is important not to jump into the deep end before you know how to swim. = Så summa summarum, detta är grunden i Unciv - Bygg en välmående första stad, expandera långsamt för att hålla steg med olycklighet, och förbered för det segervillkor som du vill arbeta mot.\nDet finns förstås mer att orda om än så, men det är viktigt att inte hoppa i den djupa ändan bassängen innan du kan simma.
 
 Enemy City = Fientlig Stad
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index a3e117957b..20f7958246 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -825,6 +825,8 @@ Waiting for other players... = 等待其他玩家...
 Waiting for [civName]... = 
 in = 完成需
 Next turn = 下一回合
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv]準備好了嗎？
 1 turn = 1回合
 [numberOfTurns] turns = [numberOfTurns]回合
@@ -5939,6 +5941,8 @@ Requires at least [amount] population = 至少需要[amount]人口
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -5959,6 +5963,9 @@ Slinger = 投石手
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = 工船
 Cannot enter ocean tiles until Astronomy = 研究出天文學之前不能進入海洋地塊
 May create improvements on water resources = 可在水上資源建造設施(工船將被消耗掉)
@@ -5974,6 +5981,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = 戰車射手
 No defensive terrain bonus = 無地形防禦力加成
 Rough terrain penalty = 崎嶇地形懲罰
@@ -6000,6 +6010,9 @@ Can only attack [unitType] units =
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = 騎手
 Can move after attacking = 攻擊後可移動
 
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index 4ec0607888..5a8f167390 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -769,6 +769,8 @@ Waiting for other players... = Diğer oyuncular bekleniyor ...
 Waiting for [civName]... = 
 in = içinde
 Next turn = Sonraki tur
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv] hazır mı?
 1 turn = 1 tur
 [numberOfTurns] turns = [numberOfTurns] tur
@@ -5560,6 +5562,8 @@ Excess Food converted to Production when under construction = Üretilirken fazla
 Requires at least [amount] population = En az [amount] nüfus gerekir
 
 May upgrade to [unit] through ruins-like effects = Antik Kalıntılar gibi elemanlar ile [unit] birliğine yükselebilir
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
 This is your basic, club-swinging fighter. = Sıradan sopa sallayan dövüşcünüz.
 
@@ -5579,6 +5583,9 @@ Slinger = Sapancı
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = İş Tekneleri
 Cannot enter ocean tiles until Astronomy = Astronomi bulunana kadar okyanuslara girilemez
 May create improvements on water resources = Su kaynakları üzerinde geliştirmeler yapabilir
@@ -5594,6 +5601,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Savaş Arabası Okçusu
 No defensive terrain bonus = Arazilerin savunma bonuslarını kullanamaz
 Rough terrain penalty = Engebeli arazi cezası
@@ -5616,6 +5626,9 @@ Can only attack [unitType] units = sadece [unitType] birliklerine saldırabilir
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Atlı
 Can move after attacking = Saldırdıktan sonra hareket edebilir
 
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index 2b65577d88..8d06e8bd93 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -732,6 +732,8 @@ Waiting for other players... = Очікування інших гравців…
 Waiting for [civName]... = 
 in = через
 Next turn = Наступний хід
+ # Requires translation!
+Move automated units = 
 [currentPlayerCiv] ready? = [currentPlayerCiv]
 1 turn = 1 хід
 [numberOfTurns] turns = Ходів: [numberOfTurns]
@@ -5500,6 +5502,8 @@ Requires at least [amount] population = Потребує щонайменш [amo
 
  # Requires translation!
 May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Never appears as a Barbarian unit = 
 
  # Requires translation!
 This is your basic, club-swinging fighter. = 
@@ -5520,6 +5524,9 @@ Slinger = Пращник
  # Requires translation!
 Atlatlist = 
 
+ # Requires translation!
+Skirmisher = 
+
 Work Boats = Робочий човен
 Cannot enter ocean tiles until Astronomy = Не може заходити до океанських клітинок до відкриття астрономії
 May create improvements on water resources = Може вдосконалювати водні ресурси
@@ -5535,6 +5542,9 @@ Quinquereme =
  # Requires translation!
 Dromon = 
 
+ # Requires translation!
+Galley = 
+
 Chariot Archer = Лучник на колісниці
 No defensive terrain bonus = Місцевість не захищає
 Rough terrain penalty = Пересічена місцевість важкопрохідна
@@ -5557,6 +5567,9 @@ Can only attack [unitType] units = Може атакувати тільки [uni
  # Requires translation!
 Pictish Warrior = 
 
+ # Requires translation!
+Marauder = 
+
 Horseman = Вершник
 Can move after attacking = Може рухатись після атаки
 
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index 9bc720f667..8dc0c511a2 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -18,7 +18,7 @@ Polish = 70
 Lithuanian = 18
 Romanian = 27
 Simplified_Chinese = 99
-Bulgarian = 19
+Bulgarian = 18
 Korean = 85
 Persian_(Pinglish-DIN) = 17
 Japanese = 71
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 1a2a68a2ad..9db563099a 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 = 641
-    const val appVersion = "3.17.12"
+    const val appCodeNumber = 642
+    const val appVersion = "3.17.13"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index fcd6bdffa9..b0fbf59140 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,22 @@
+## 3.17.13
+
+Show construction icons in Cities Overview.  - By will-ca
+
+Remove Discord RPC checks for unsuitable devices  - By asda488
+
+Allow unit movement after unit automation steps
+
+By SimonCeder:
+- Barbarian units
+- Fix for broken saves in #5573
+- Barbarian fixes
+
+By SomeTroglodyte:
+- Fix PercentProductionBuildings and PercentProductionWonders
+- Minor hardening of music against OpenAL quirks
+
+GameInfoPreview upload as Metadata  - By GGGuenni
+
 ## 3.17.12
 
 Clarified Oil well / Refrigeration relation - By SomeTroglodyte