diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index 296550a801..8f45572055 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -1485,7 +1485,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -4475,7 +4475,7 @@ Police State = Estado de Polícia
 Total War = Guerra Total
 Autocracy Complete = Autocracia Completa
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
 Autocracy = Autocracia
 
  # Requires translation!
@@ -7442,8 +7442,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index e8746df6be..899172b2bc 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -1510,7 +1510,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -5415,7 +5415,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
  # Requires translation!
 Autocracy = 
 
@@ -8897,8 +8897,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 0c65aeb104..2136e270ec 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -1239,7 +1239,7 @@ Religion: Off = Náboženství: Vypnuto
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -3432,7 +3432,7 @@ Quantity of strategic resources produced by the empire +[amount]% = +[amount]% s
 Police State = Policejní stát
 Total War = Totální válka
 Autocracy Complete = Kompletní Autokracie
-+[amount]% attack strength to all [unitType] units for [amount2] turns = +[amount]% bonus k útoku všem [unitType] na [amount2] tahů
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = +[amount]% bonus k útoku všem [mapUnitFilter] na [amount2] tahů
 Autocracy = Autokracie
 
 United Front = Jednotná fronta
@@ -5841,8 +5841,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index b958bdd28a..1f66f4e52d 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -1253,7 +1253,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -4581,7 +4581,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
 Autocracy = Autocratie
 
  # Requires translation!
@@ -7747,8 +7747,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index 3136ab25d9..a66212563a 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -2208,7 +2208,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -6190,7 +6190,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
  # Requires translation!
 Autocracy = 
 
@@ -9655,8 +9655,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index d9761361d0..bd0e58477f 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -2080,7 +2080,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -6066,7 +6066,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
  # Requires translation!
 Autocracy = 
 
@@ -9571,8 +9571,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index ee3a184400..3c309b6f3a 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -1441,7 +1441,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -4421,7 +4421,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
 Autocracy = Yksinvaltius
 
  # Requires translation!
@@ -7799,8 +7799,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index ea9984bd74..516f5a23ce 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -1266,7 +1266,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -3631,7 +3631,7 @@ Police State = Etat policier
 Total War = Guerre Totale
 Autocracy Complete = Autocratie complète
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
 Autocracy = Autocratie
 
  # Requires translation!
@@ -6556,8 +6556,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 1e6e6b200e..f369272ff6 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -35,21 +35,15 @@ Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not s
 
 # Crash screen
 
- # Requires translation!
 An unrecoverable error has occurred in Unciv: = In Unciv ist ein nicht behebbarer Fehler aufgetreten:
- # Requires translation!
 If this keeps happening, you can try disabling mods. = Wenn dies weiterhin geschieht, kannst du versuchen, die Mods zu deaktivieren.
  # Requires translation!
 You can also report this on the issue tracker. = 
- # Requires translation!
 Copy = Kopieren
- # Requires translation!
 Error report copied. = Fehlerreport kopiert.
  # Requires translation!
 Open Issue Tracker = 
- # Requires translation!
 Please copy the error report first. = Bitte kopiere zuerst den Fehlerreport.
- # Requires translation!
 Close Unciv = Beende Univ
 
 # Buildings
@@ -325,7 +319,6 @@ Game Options = Spieloptionen
 Civilizations = Zivilisationen
 Map Type = Kartentyp
 Map file = Karten-Datei
- # Requires translation!
 Max Turns = Maximale Runden
 Could not load map! = Diese Karte konnte nicht geladen werden!
 Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = Üngültige Karte: Die Fläche ([area]) stimmt nicht mit den gespeicherten Abmessungen ([dimensions]) überein.
@@ -352,7 +345,6 @@ Scientific = Wissenschaftlich
 Domination = Vorherrschaft
 Cultural = Kulturell
 Diplomatic = Diplomatisch
- # Requires translation!
 Time = Zeit
 
 Map Shape = Kartenform
@@ -545,7 +537,6 @@ Show pixel units = Zeige Pixel Einheiten
 Show pixel improvements = Zeige Pixel Verbesserungen
 Enable nuclear weapons = Aktiviere Atomwaffen
 Show tile yields = Felderträge anzeigen
- # Requires translation!
 Show unit movement arrows = Bewegungspfeile für Einheiten anzeigen
 Continuous rendering = Kontinuierliches Rendern
 When disabled, saves battery life but certain animations will be suspended = Es spart Akku, wenn es deaktiviert ist, aber bestimmte Animationen werden nicht angezeigt.
@@ -1182,7 +1173,8 @@ Cities following this religion: = Städte die dieser Religion folgen
 Click an icon to see the stats of this religion = Klicke auf ein Icon, um die Statistiken dieser Religion anzuzeigen
 Religion: Off = Religion: Ausgeschaltet
 Minimal faith required for\nthe next [Great Prophet]: = Mindest-Glaubenspunkte für\nden nächsten [Great Prophet]:
-Religions founded: = Gegründete Religionen:
+ # Requires translation!
+Religions to be founded: = 
 Religious status: = Religions-Status:
 
 None = Keine
@@ -3239,7 +3231,6 @@ Warrior Code = Kriegerkodex
 Discipline = Disziplin
 [amount]% Strength for [unitType] units which have another [unitType2] unit in an adjacent tile = [amount]% Stärke für [unitType] Einheiten, die eine andere [unitType2] Einheit in einem benachbarten Feld haben
 Military Tradition = Militärtradition
- # Requires translation!
 [amount]% XP gained from combat = [amount]% XP im Kampf gewonnen
 Military Caste = Militarisierte Burg
 Professional Army = Berufsarmee
@@ -3314,7 +3305,7 @@ Quantity of strategic resources produced by the empire +[amount]% = Menge der vo
 Police State = Polizeistaat
 Total War = Totaler Krieg
 Autocracy Complete = Autokratie vollständig
-+[amount]% attack strength to all [unitType] units for [amount2] turns = +[amount]% Angriffsstärke für alle [unitType] Einheiten [amount2] Runden lang
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = +[amount]% Angriffsstärke für alle [mapUnitFilter] Einheiten [amount2] Runden lang
 Autocracy = Autokratie
 
 United Front = Vereinte Front
@@ -5378,7 +5369,6 @@ if this city has at least [amount] specialists = wenn diese Stadt mindestens [am
 for [mapUnitFilter] units = für [mapUnitFilter] Einheiten
 vs cities = vs Städte
 vs [mapUnitFilter] units = vs [mapUnitFilter] Einheiten
- # Requires translation!
 when fighting units from a Civilization with more Cities than you = beim Kampf gegen Einheiten einer Zivilisation mit mehr Städten als du
 when attacking = beim Angriff
 when defending = beim Verteidigen
@@ -5414,8 +5404,6 @@ This Unit gains [amount] XP = Die Einheit erhält [amount] EP
 This Unit upgrades for free including special upgrades = 
  # Requires translation!
 This Unit gains the [promotion] promotion = 
- # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
 Hidden before founding a Pantheon = Versteckt, bevor ein Pantheon gegründet wurde
 Hidden after founding a Pantheon = Versteckt, nachdem ein Pantheon gegründet wurde
 Hidden after generating a Great Prophet = Versteckt, nachdem ein Großer Prophet erzeugt wurde
diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties
index 4596f4c4ba..889c3c11cb 100644
--- a/android/assets/jsons/translations/Greek.properties
+++ b/android/assets/jsons/translations/Greek.properties
@@ -1840,7 +1840,7 @@ Religion: Off = Θρησκεία : απενεργοποιημένη
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -5652,7 +5652,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
  # Requires translation!
 Autocracy = 
 
@@ -9094,8 +9094,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 27e57b6b31..6ed42dab90 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -1476,7 +1476,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -4365,7 +4365,7 @@ Police State = Rendőrállam
 Total War = Totális háború
 Autocracy Complete = Autokrácia befejezve
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
 Autocracy = Autokrácia
 
 United Front = Egységes Front
@@ -7371,8 +7371,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 69962baeaf..7fb47b7d97 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -1174,7 +1174,8 @@ 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
 Minimal faith required for\nthe next [Great Prophet]: = Iman minimal yang diperlukan untuk\n[Great Prophet] selanjutnya:
-Religions founded: = Agama didirikan:
+ # Requires translation!
+Religions to be founded: = 
 Religious status: = Status agama:
 
 None = Tidak ada
@@ -3306,7 +3307,7 @@ Quantity of strategic resources produced by the empire +[amount]% = Jumlah sumbe
 Police State = Negara Kepolisian
 Total War = Perang Total
 Autocracy Complete = Otokrasi Lengkap
-+[amount]% attack strength to all [unitType] units for [amount2] turns = +[amount]% kekuatan serangan kepada semua unit [unitType] untuk [amount2] giliran
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = +[amount]% kekuatan serangan kepada semua unit [mapUnitFilter] untuk [amount2] giliran
 Autocracy = Otokrasi
 
 United Front = Front Bersatu
@@ -5389,7 +5390,6 @@ From a randomly chosen tile [amount] tiles away from the ruins, reveal tiles up
 This Unit gains [amount] XP = Unit ini mendapatkan [amount] XP
 This Unit upgrades for free including special upgrades = unit ini secara gratis ditingkatkan dan sudah termasuk peningkatan spesial
 This Unit gains the [promotion] promotion = unit ini memperoleh promosi [promotion]
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = +[amount]% kekuatan serangan untuk semua [mapUnitFilter] unit dalam [amount2] giliran 
 Hidden before founding a Pantheon = Tersembunyi sebelum membangun Pantheon 
 Hidden after founding a Pantheon = Tersembunyi setelah membangun Pantheon
 Hidden after generating a Great Prophet = Tersembunyi setelah mendapatkan Nabi
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index b46a6a7f58..cc9c7f091a 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -1172,7 +1172,8 @@ Cities following this religion: = Città che seguono questa religione
 Click an icon to see the stats of this religion = Clicca su un'icona per vedere le statistiche della religione
 Religion: Off = Religione: OFF
 Minimal faith required for\nthe next [Great Prophet]: = Fede richiesta per il\nprossimo [Great Prophet]:
-Religions founded: = Religioni fondate
+ # Requires translation!
+Religions to be founded: = 
 Religious status: = Stato religione
 
 None = Nessuno
@@ -3304,7 +3305,7 @@ Quantity of strategic resources produced by the empire +[amount]% = +[amount]% q
 Police State = Stato di polizia
 Total War = Guerra Totale
 Autocracy Complete = Autocrazia Completa
-+[amount]% attack strength to all [unitType] units for [amount2] turns = +[amount]% Forza per tutte le unità [unitType] per [amount2] turni
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = +[amount]% Forza per tutte le unità [mapUnitFilter] per [amount2] turni
 Autocracy = Autocrazia
 
 United Front = Fronte unito
@@ -5385,7 +5386,6 @@ From a randomly chosen tile [amount] tiles away from the ruins, reveal tiles up
 This Unit gains [amount] XP = L'unità ottiene [amount] XP
 This Unit upgrades for free including special upgrades = L'unità viene aggiornata gratuitamente con tutti i suoi aggiornamenti speciali
 This Unit gains the [promotion] promotion = L'unità ottiene la promozione [promotion]
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = +[amount]% attacco per tutte le unità [mapUnitFilter] per [amount2] turni
 Hidden before founding a Pantheon = Nascosto finché non fondi un Pantheon
 Hidden after founding a Pantheon = Nascosto quando fondi un Pantheon
 Hidden after generating a Great Prophet = Nascosto quando ottieni un Grande Profeta
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index f447adc182..f1f490a5cd 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -1428,7 +1428,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -3744,7 +3744,7 @@ Quantity of strategic resources produced by the empire +[amount]% = 戦略資源
 Police State = 警察国家
 Total War = 総力戦
 Autocracy Complete = 独裁政治コンプリート
-+[amount]% attack strength to all [unitType] units for [amount2] turns = [amount2]ターンの間すべての[unitType]ユニットの攻撃力+[amount]%
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = [amount2]ターンの間すべての[mapUnitFilter]ユニットの攻撃力+[amount]%
 Autocracy = 独裁政治
 
 United Front = 統一戦線
@@ -6663,8 +6663,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 3b3849194f..edd6591047 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -1314,7 +1314,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -3538,7 +3538,7 @@ Quantity of strategic resources produced by the empire +[amount]% = 모든 전
 Police State = 경찰국가
 Total War = 총력전
 Autocracy Complete = 독재 완성
-+[amount]% attack strength to all [unitType] units for [amount2] turns = [amount2]턴 동안 모든 [unitType]의 전투력 +[amount]%
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = [amount2]턴 동안 모든 [mapUnitFilter]의 전투력 +[amount]%
 Autocracy = 독재
 
 United Front = 통일 전선
@@ -6102,8 +6102,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index 9aaa93e66f..1e72a543f0 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -1553,7 +1553,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -5452,7 +5452,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
  # Requires translation!
 Autocracy = 
 
@@ -8927,8 +8927,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index 0e5f8e7c65..a4b730e73e 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -1362,7 +1362,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -5111,7 +5111,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
  # Requires translation!
 Autocracy = 
 
@@ -8494,8 +8494,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index f94aeff477..5cadd7e486 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -1553,7 +1553,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -5445,7 +5445,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
  # Requires translation!
 Autocracy = 
 
@@ -8944,8 +8944,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index 964b4894cf..1d8570f1a1 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -1550,7 +1550,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -5442,7 +5442,7 @@ Total War =
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
  # Requires translation!
 Autocracy = 
 
@@ -8941,8 +8941,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index 2c699b63ee..9b0812c3e1 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -1395,7 +1395,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -3794,7 +3794,7 @@ Police State = Państwo Policyjne
 Total War = Wojna Absolutna
 Autocracy Complete = Ukończona Autokracja
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
 Autocracy = Autokracja
 
  # Requires translation!
@@ -6710,8 +6710,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index 60d4723ada..6a7863a586 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -1346,7 +1346,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -4148,7 +4148,7 @@ Police State = Estado de Polícia
 Total War = Guerra Total
 Autocracy Complete = Autocracia Completa
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
 Autocracy = Autocracia
 
  # Requires translation!
@@ -7053,8 +7053,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index 10933f6235..965967fc11 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -2,13 +2,11 @@
 
 # Equivalent of a space in your language
 # If your language doesn't use spaces, just add "" as a translation, otherwise " "
- # Requires translation!
 " " = " "
 
 # If the first word in a sentence starts with a capital in your language, 
 # put the english word 'true' behind the '=', otherwise 'false'.
 # Don't translate these words to your language, only put 'true' or 'false'.
- # Requires translation!
 StartWithCapitalLetter = true
 
 
@@ -56,19 +54,14 @@ Close Unciv =
 
 # Buildings
 
- # Requires translation!
 Unsellable = Nu se poate vinde 
- # Requires translation!
 Not displayed as an available construction unless [building] is built = Nu se afișează ca și construcție disponibilă decât dacă [building] este construită
- # Requires translation!
 Not displayed as an available construction without [resource] = Nu se afișează ca și construcție disponibilă fără [resource]
 
 Choose a free great person = Alege o Persoană Extraordinară gratis
- # Requires translation!
 Get [unitName] = Obține [unitName]
 
 Hydro Plant = Hidrocentrală
- # Requires translation!
 [buildingName] obsoleted = [buildingName] este demodată
 
 # Diplomacy,Trade,Nations
@@ -77,37 +70,24 @@ Requires [buildingName] to be built in the city = Necesită ca [buildingName] s
 Requires [buildingName] to be built in all cities = Necesită ca [buildingName] să fie construit(ă) în toate orașele
 Provides a free [buildingName] in the city = Oferă gratuit un/o [buildingName] în oraș
 Requires worked [resource] near city = Necesită [resource] prelucrat(ă) în apropierea orașului
- # Requires translation!
 Requires at least one of the following resources worked near the city: = Necesită cel puțin una dintre următoarele resurse prelucrate în apropierea orașului:
 Wonder is being built elsewhere = Această Minune este în proces de construire în altă parte
- # Requires translation!
 National Wonder is being built elsewhere = Minunea Națională se construiește în altă parte
 Requires a [buildingName] in all cities = Necesită ca [buildingName] să fie în toate orașele
- # Requires translation!
 [buildingName] required: = este necesar [buildingName]:
 Requires a [buildingName] in this city = Necesită ca [buildingName] să fie în acest oraș
- # Requires translation!
 Cannot be built with [buildingName] = Nu poate fi construit cu [buildingName]
 Consumes 1 [resource] = Necesită 1 [resource]
- # Requires translation!
 Consumes [amount] [resource] = Consumă [amount] [resource]
 Required tech: [requiredTech] = Tehnologie necesară: [requiredTech]
- # Requires translation!
 Requires [PolicyOrNationalWonder] = Necesită [PolicyOrNationalWonder]
- # Requires translation!
 Cannot be purchased = Nu poate fi cumpărat
- # Requires translation!
 Can only be purchased = Poate fi doar cumpărat
- # Requires translation!
 See also = Vezi și
 
- # Requires translation!
 Requires at least one of the following: = Necesită cel puțin una dintre următoarele:
- # Requires translation!
 Requires all of the following: = Necesită toate cele ce urmează:
- # Requires translation!
 Leads to [techName] = Duce la [techName]
- # Requires translation!
 Leads to: = Duce la:
 
 Current construction = Construcția curentă
@@ -118,9 +98,7 @@ Add to queue = Adaugă la coadă
 Remove from queue = Scoate din coadă
 Show stats drilldown = Arată statistici detaliate
 Show construction queue = Arată coada de construcție
- # Requires translation!
 Save = Salvează
- # Requires translation!
 Cancel = Anulează
 
 Diplomacy = Diplomație
@@ -129,7 +107,6 @@ Peace = Pace
 Research Agreement = Acord de Cercetare
 Declare war = Declară război
 Declare war on [civName]? = Declari război contra [civName]?
- # Requires translation!
 Let's begin! = Să începem!
 [civName] has declared war on us! = [civName] ne-au declarat război!
 [leaderName] of [nation] = [leaderName] de [nation]
@@ -148,7 +125,6 @@ We have encountered the City-State of [name]! = Am întalnit Orașul-Stat al [na
 Declare Friendship ([numberOfTurns] turns) = Declară prietenia ([numberOfTurns] ture)
 May our nations forever remain united! = Fie ca națiunile noastre să rămână pentru totdeauna unite!
 Indeed! = Într-adevăr!
- # Requires translation!
 Denounce [civName]? = Denunți [civName]?
 Denounce ([numberOfTurns] turns) = Denunță ([numberOfTurns] ture)
 We will remember this. = O să ținem minte asta.
@@ -157,24 +133,16 @@ We will remember this. = O să ținem minte asta.
 [civName] and [targetCivName] have signed a Peace Treaty! = [civName] împreună cu [targetCivName] au semnat tratatul de pace!
 [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] împreună cu [targetCivName] au semnat declarația de prietenie!
 [civName] has denounced [targetCivName]! = [civName] a denunțat [targetCivName]!
- # Requires translation!
 Do you want to break your promise to [leaderName]? = Vrei să îți încalci promisiunea făcută lui [leaderName]?
- # Requires translation!
 We promised not to settle near them ([count] turns remaining) = Le-am promis că nu vom crea așezări în apropierea lor ([count] ture rămase)
- # Requires translation!
 They promised not to settle near us ([count] turns remaining) = Au promis că nu vor crea așezări în apropierea noastră ([count] ture rămase)
 
- # Requires translation!
 [civName] is upset that you demanded tribute from [cityState], whom they have pledged to protect! = [civName] este supărată deoarece ai cerut tribut de la [cityState], pe care ei au jurat că o vor proteja!
- # Requires translation!
 [civName] is upset that you attacked [cityState], whom they have pledged to protect! = [civName] este supărată deoarece ai atacat [cityState], pe care ei au jurat că o vor proteja!
- # Requires translation!
 [civName] is outraged that you destroyed [cityState], whom they had pledged to protect! = [civName] este supărată deoarece ai distrus [cityState], pe care ei au jurat că o vor proteja!
- # Requires translation!
 [civName] has destroyed [cityState], whom you had pledged to protect! = [civName] a distrus [cityState], pe care ai jurat că o vei proteja!
 
 Unforgivable = De neiertat
- # Requires translation!
 Afraid = Înfricoșat
 Enemy = Inamic
 Competitor = Competitor
@@ -183,12 +151,9 @@ Favorable = Favorabil
 Friend = Prieten
 Ally = Aliat
 
- # Requires translation!
 [questName] (+[influenceAmount] influence) = [questName] +[influenceAmount] influență) 
 [remainingTurns] turns remaining = [remainingTurns] ture rămase 
- # Requires translation!
 Current leader is [civInfo] with [amount] [stat] generated. = Liderul curent este [civInfo] cu [amount] [stat] generate.
- # Requires translation!
 Current leader is [civInfo] with [amount] Technologies discovered. = Liderul curent este [civInfo] cu [amount] Tehnologii descoperite.
 
 ## Diplomatic modifiers
@@ -197,7 +162,6 @@ You declared war on us! = Ne-ai declarat război!
 Your warmongering ways are unacceptable to us. = Căile tale ațâțătoare la război sunt inacceptabile pentru noi.
 You have captured our cities! = Ne-ai capturat orașele!
 We applaud your liberation of our conquered cities! = Te felicităm pentru liberarea orașelor noastre cucerite!
- # Requires translation!
 We applaud your liberation of conquered cities! = Te felicităm pentru liberarea orașelor cucerite!
 Years of peace have strengthened our relations. = Anii de pace ne-au întărit relațiile.
 Our mutual military struggle brings us closer together. = Efortul nostru militar comun ne apropie.
@@ -215,14 +179,11 @@ You refused to stop settling cities near us = Ai refuzat să te oprești din a 
 Your arrogant demands are in bad taste = Cererile tale arogante sunt de prost gust
 Your use of nuclear weapons is disgusting! = Folosirea armelor nucleare e dezgustătoare!
 You have stolen our lands! = Ne-ai furat pământurile!
- # Requires translation!
 You gave us units! = Ne-ai oferit unități!
 You destroyed City States that were under our protection! = Ai distrus Orașe Stat care erau sub protecția noastră!
 You attacked City States that were under our protection! = Ai atacat Orașe Stat care erau sub protecția noastră!
 You demanded tribute from City States that were under our protection! = Ai cerut tribut de la Orașe Stat care erau sub protecția noastră!
- # Requires translation!
 You sided with a City State over us = Te-ai dat de partea unui Oraș Stat în loc de a noastră
- # Requires translation!
 You returned captured units to us = Ne-ai returnat unități capturate
 
 Demands = Cereri
@@ -230,21 +191,14 @@ Please don't settle new cities near us. = Te rog să nu mai întemeiezi orașe l
 Very well, we shall look for new lands to settle. = Foarte bine, ar trebui să căutăm noi pământuri pentru a ne așeza.
 We shall do as we please. = O să facem cum vrem.
 We noticed your new city near our borders, despite your promise. This will have....implications. = Am văzut noul tău oraș de lângă granița noastră, în ciuda promisiunii. Asta va creea... complicații.
- # Requires translation!
 I've been informed that my armies have taken tribute from [civName], a city-state under your protection.\nI assure you, this was quite unintentional, and I hope that this does not serve to drive us apart. = Am fost informat că armatele mele au luat tribut de la [civName], un oraș-stat aflat sub protecția ta. \nTe asigur, acest lucru nu a fost intenționat, și sper că nu va contribui la dezbinarea noastră. 
- # Requires translation!
 We asked [civName] for a tribute recently and they gave in.\nYou promised to protect them from such things, but we both know you cannot back that up. = Am cerut tribut de la [civName] recent iar ei au cedat.\nAi promis că îi vei proteja de astfel de lucruri, însă știm amăndoi că nu îi poți ajuta.
- # Requires translation!
 It's come to my attention that I may have attacked [civName], a city-state under your protection.\nWhile it was not my goal to be at odds with your empire, this was deemed a necessary course of action. = A ajuns în atenția mea faptul că aș fi atacat [civName], un oraș-stat sub protecția ta.\nDeși scopul nu era să ne punem rău cu imperiul tău, această acțiune a fost considerată necesară.
- # Requires translation!
 I thought you might like to know that I've launched an invasion of one of your little pet states.\nThe lands of [civName] will make a fine addition to my own. = M-am gândit că ai vrea să știi de invazia pe care am lansat-o asupra uneia dintre statele tale marionetă.\nPământurile din [civName] vor fi o adiție bună alor mele.
 
- # Requires translation!
 Return [unitName] to [civName]? = Returnezi [unitName] to [civName]
- # Requires translation!
 The [unitName] we liberated originally belonged to [civName]. They will be grateful if we return it to them. = [unitName]ul pe care l-am eliberat aparținea original de [civName]
 
- # Requires translation!
 Enter the amount of gold = Introdu cantitatea de aur
 
 # City-States
@@ -253,55 +207,32 @@ Provides [amountOfCulture] culture at 30 Influence = Oferă [amountOfCulture] cu
 Provides 3 food in capital and 1 food in other cities at 30 Influence = Oferă 3 mâncare în capitală și 1 mâncare în celelalte orașe la 30 Influență
 Provides 3 happiness at 30 Influence = Oferă 3 bucurie la 30 Influență
 Provides land units every 20 turns at 30 Influence = Oferă unități terestre la fiecare 20 de ture la 30 Influență
- # Requires translation!
 Give a Gift = Oferă un Cadou
 Gift [giftAmount] gold (+[influenceAmount] influence) = Dăruiește [giftAmount] aur (+[influenceAmount] Influență)
 Relationship changes in another [turnsToRelationshipChange] turns = Relațiile se vor schimba în [turnsToRelationshipChange] ture
- # Requires translation!
 Protected by = Protejat de
- # Requires translation!
 Revoke Protection = Retrage Protecția
- # Requires translation!
 Pledge to protect = Jură protecție
- # Requires translation!
 Declare Protection of [cityStateName]? = Declari Protecție pentru [cityStateName]?
- # Requires translation!
 Build [improvementName] on [resourceName] (200 Gold) = Construiește [improvementName] pe [resourceName] (200 Aur)
- # Requires translation!
 Gift Improvement = Cadou Îmbunătățire
- # Requires translation!
 [civName] is able to provide [unitName] once [techName] is researched. = [civName] va putea oferi [unitName] odată ce [techName] este cercetată.
 
- # Requires translation!
 Diplomatic Marriage ([amount] Gold) = Mariaj Diplomatic ([amount] Aur)
- # Requires translation!
 We have married into the ruling family of [civName], bringing them under our control. = Avem o căsătorie în interiorul familiei conducătoare din [civName], aducându-i sub controlul nostru.
- # Requires translation!
 [civName] has married into the ruling family of [civName2], bringing them under their control. = [civName] are un mariaj în familia conducătoare din [civName2], aducându-i sub controlul lor.
- # Requires translation!
 You have broken your Pledge to Protect [civName]! = Ți-ai încălcat Jurământul de Protecție pentru [civName]!
- # Requires translation!
 City-States grow wary of your aggression. The resting point for Influence has decreased by [amount] for [civName]. = Orașele-Stat devin conștiente de agresivitatea ta. Punctul de bază pentru Influență a scăzut cu [amount] pentru [civName]
 
- # Requires translation!
 [cityState] is being attacked by [civName] and asks all major civilizations to help them out by gifting them military units. = [cityState] este atacată de [civName] și solicită ajutor de la toate civilizațiile mari prin oferirea de unități militare.
- # Requires translation!
 [cityState] is being invaded by Barbarians! Destroy Barbarians near their territory to earn Influence. = [cityState] este invadată de Barbari! Distruge Barbarii din teritoriul apropiat pentru a obține Influență.
- # Requires translation!
 [cityState] is grateful that you killed a Barbarian that was threatening them! = [cityState] este recunoscătoare că ai eliminat un Barbar care îi amenința!
- # Requires translation!
 [cityState] is being attacked by [civName]! Kill [amount] of the attacker's military units and they will be immensely grateful. = [cityState] este atacată de [civName]! Elimină [amount] de unitățî militare ale atacatorului iar ei vor fi foarte recunoscători.
- # Requires translation!
 [cityState] is deeply grateful for your assistance in the war against [civName]! = [cityState] este profund recunoscătoare pentru asistarea ta la războiul împotriva [civName]!
- # Requires translation!
 [cityState] no longer needs your assistance against [civName]. = [cityState] nu mai are nevoie de asistența ta împotriva [civName].
- # Requires translation!
 War against [civName] = Război împotriva [civName]
- # Requires translation!
 We need you to help us defend against [civName]. Killing [amount] of their military units would slow their offensive. = Avem nevoie de ajutorul tău pentru a ne apăra împotriva [civName]. Eliminarea a [amount] dintre unitățile lor militare le-ar încetini ofensiva.
- # Requires translation!
 Currently you have killed [amount] of their military units. = Pănă acum ai eliminat [amount] dintre unitățile lor militare.
- # Requires translation!
 You need to find them first! = Trebuie mai întâi să îi găsești!
 
 Cultured = Cult
@@ -316,50 +247,28 @@ Personality = Personalitate
 Influence = Influență
 Reach 30 for friendship. = Atinge 30 pentru prietenie.
 Reach highest influence above 60 for alliance. = Atinge cea mai mare influență peste 60 pentru alianță.
- # Requires translation!
 When Friends: = Atunci când sunt Prieteni:
- # Requires translation!
 When Allies: = Atunci când sunt Aliați:
- # Requires translation!
 The unique luxury is one of: = Unicul lux este unul de:
 
- # Requires translation!
 Demand Tribute = Cere Tribut
- # Requires translation!
 Tribute Willingness = Voința de a da Tribut
- # Requires translation!
 At least 0 to take gold, at least 30 and size 4 city for worker = Cel puțin 0 pentru a lua aur, cel puțin 30 și oraș de mărime 4 pentru muncitor
- # Requires translation!
 Major Civ = Civilizație Majoră
- # Requires translation!
 No Cities = Nu sunt Orașe
- # Requires translation!
 Base value = Cea mai bună valoare
- # Requires translation!
 Has Ally = Are Aliați
- # Requires translation!
 Has Protector = Are Protector
- # Requires translation!
 Demanding a Worker = Necesită un Muncitor
- # Requires translation!
 Demanding a Worker from small City-State = Necesită un Muncitor de la un Oraș-Stat mic
- # Requires translation!
 Very recently paid tribute = Tribut plătit foarte recent
- # Requires translation!
 Recently paid tribute = Tribut plătit recent
- # Requires translation!
 Influence below -30 = Influență sub -30
- # Requires translation!
 Military Rank = Rang Militar
- # Requires translation!
 Military near City-State = Militărie lângă Orașul-Stat
- # Requires translation!
 Sum: = Sumă
- # Requires translation!
 Take [amount] gold (-15 Influence) = Ia [amount] aur (-15 Influență)
- # Requires translation!
 Take worker (-50 Influence) = Ia Muncitor (-50 Influență)
- # Requires translation!
 [civName] is afraid of your military power! = [civName] este înfricoșată de puterea ta militară!
 
 
@@ -373,9 +282,7 @@ Our items = Articolele noastre
 Our trade offer = Oferta noastră
 [otherCiv]'s trade offer = Ofertă de schimb a [otherCiv]
 [otherCiv]'s items = Articolele de la [otherCiv]
- # Requires translation!
 +[amount] untradable copy = +[amount] copie necomercializabilă
- # Requires translation!
 +[amount] untradable copies = +[amount] copii necomercializabile
 Pleasure doing business with you! = Este o plăcere să facem afaceri împreună!
 I think not. = Nu cred.
@@ -411,24 +318,18 @@ Uniques = Unice
 Promotions = Promoții
 Load copied data = Încarcă date copiate
 Could not load game from clipboard! = Jocul nu a putut fi încărcat din clipboard!
- # Requires translation!
 Reset to defaults = Resetează la valorile implicite
- # Requires translation!
 Are you sure you want to reset all game options to defaults? = Ești sigur că vrei să resetezi toate opțiunile jocului la cele implicite?
 Start game! = Începe jocul!
 Map Options = Opțiuni ale hărții
 Game Options = Opțiuni ale jocului
- # Requires translation!
 Civilizations = Civilizații
 Map Type = Tipul hărții
- # Requires translation!
 Map file = Fișier hartă
  # Requires translation!
 Max Turns = 
 Could not load map! = Nu s-a putut încărca harta!
- # Requires translation!
 Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = Hartă invalidă: Suprafața ([area]) nu corespunde cu dimensiunile ([dimensions]) salvate.
- # Requires translation!
 The dimensions have now been fixed for you. = Dimensiunile au fost setate pentru tine.
 Generated = Generat
 Existing = Existent
@@ -438,16 +339,12 @@ Default = Implicit
 Pangaea = Pangaea
 Perlin = Perlin
 Continents = Continente
- # Requires translation!
 Four Corners = Patru Colțuri
- # Requires translation!
 Archipelago = Arhipeleag
- # Requires translation!
 Inner Sea = Mare interioară
 Number of City-States = Numărul de orașe-stat
 One City Challenge = Provocare cu un oraș
 No Barbarians = Fără barbari
- # Requires translation!
 Raging Barbarians = Barbari furioși
 No Ancient Ruins = Fără ruine antice
 No Natural Wonders = Fără minuni naturale
@@ -455,37 +352,25 @@ Victory Conditions = Condiții de victorie
 Scientific = Știință
 Domination = Dominație
 Cultural = Cultură
- # Requires translation!
-
 Diplomatic = Diplomatic
+ # Requires translation!
 Time = 
 
 Map Shape = Forma hărții
 Hexagonal = Hexagonală
 Rectangular = Dreptunghiulară
- # Requires translation!
 Height = Înălțime
- # Requires translation!
 Width = Lățime
- # Requires translation!
 Radius = Rază
- # Requires translation!
 Enable Religion = Activare Religie
 
- # Requires translation!
 Resource Setting = Setare Resurse
- # Requires translation!
 Sparse = Rar
- # Requires translation!
 Abundant = Abundent
- # Requires translation!
 Strategic Balance = Balanță Strategică
- # Requires translation!
 Legendary Start = Start Legendar
 
- # Requires translation!
 Advanced Settings = Setări Avansate
- # Requires translation!
 RNG Seed = RNG Seed
 Map Elevation = Înălțimea hărții
 Temperature extremeness = Extremitatea temperaturii
@@ -504,13 +389,9 @@ Small = Mic
 Medium = Mediu
 Large = Mare
 Huge = Imens
- # Requires translation!
 World wrap requires a minimum width of 32 tiles = Împachetarea lumii necesită cel puțin 32 de dale
- # Requires translation!
 The provided map dimensions were too small = Dimensiunile date pentru hartă sunt prea mici
- # Requires translation!
 The provided map dimensions were too big = Dimensiunile date pentru hartă sunt prea mari
- # Requires translation!
 The provided map dimensions had an unacceptable aspect ratio = Dimensiunile date pentru hartă au un raport de aspect neacceptat
 
 Difficulty = Dificultate
@@ -535,46 +416,26 @@ It looks like we can't make a map with the parameters you requested! = Se pare c
 Maybe you put too many players into too small a map? = Poate ai pus prea multi jucători pe o hartă mică?
 No human players selected! = Nu au fost selectați jucători umani!
 Mods: = Mod-uri:
- # Requires translation!
 Extension mods: = Mod-uri de extindere
- # Requires translation!
 Base ruleset: = Set de reguli de bază
- # Requires translation!
 The mod you selected is incorrectly defined! = Mod-ul selectat nu este definit corect!
- # Requires translation!
 The mod combination you selected is incorrectly defined! = Combinația selectată de Mod-uri nu este definită corect!
- # Requires translation!
 The mod combination you selected has problems. = Combinația selectată de Mod-uri are probleme.
- # Requires translation!
 You can play it, but don't expect everything to work! = Poți să joci, dar nu te aștepta ca totul să funcționeze!
- # Requires translation!
 This base ruleset is not compatible with the previously selected\nextension mods. They have been disabled. = Acest Set de Reguli de bază nu este compatibil cu Mod-urile selectate\de extindere anterioare.
- # Requires translation!
 Base Ruleset = Set de Reguli de bază
- # Requires translation!
 [amount] Techs = [amount] Tehnologii
- # Requires translation!
 [amount] Nations = [amount] Națiuni
- # Requires translation!
 [amount] Units = [amount] Unități
- # Requires translation!
 [amount] Buildings = [amount] Clădiri
- # Requires translation!
 [amount] Resources = [amount] Resurse
- # Requires translation!
 [amount] Improvements = [amount] Îmbunătățiri
- # Requires translation!
 [amount] Religions = [amount] Religii
- # Requires translation!
 [amount] Beliefs = [amount] Credințe
 
- # Requires translation!
 World Wrap = Împachetare Lume
- # Requires translation!
 World wrap maps are very memory intensive - creating large world wrap maps on Android can lead to crashes! = Hărțile de tip Împachetare Lume sunt intensive pe parte de memorie - crearea unei Împachetări de Lume prea mari pe Android poate cauza blocări.
- # Requires translation!
 Anything above 80 by 50 may work very slowly on Android! = Orice valoare între 80 și 50 poate funcțîona foarte încet pe Android!
- # Requires translation!
 Anything above 40 may work very slowly on Android! = Orice valoare peste 40 poate funcțîona foarte încet pe Android!
 
 # Multiplayer
@@ -598,7 +459,6 @@ Players can enter your game by copying the game ID to the clipboard, and clickin
 The symbol of your nation will appear next to the game when it's your turn = Simbolul națiunii tale va apărea lângă joc când este tura ta.
 Back = Înapoi
 Rename = Redenumește
- # Requires translation!
 Game settings = Setările jocului
 Add multiplayer game = Adaugă joc multiplayer
 Refresh list = Reîmpropspătează lista
@@ -611,23 +471,14 @@ Add Currently Running Game = Adaugă joc în curs
 Game name = Nunele jocului
 Loading latest game state... = Se încarcă ultima stare a jocului...
 Couldn't download the latest game state! = Nu s-a putut încarca ultima stare a jocului!
- # Requires translation!
 Resign = Renunță
- # Requires translation!
 Are you sure you want to resign? = Ești sigur că vrei să renunți?
- # Requires translation!
 You can only resign if it's your turn = Poți renunța doar dacă este rândul tău
- # Requires translation!
 [civName] resigned and is now controlled by AI = [civName] a renunțat iar acum este controlată de AI
- # Requires translation!
 Last refresh: [time] [timeUnit] ago = Ultima reîmprospătare: acum [time] [timeUnit]
- # Requires translation!
 Current Turn: [civName] since [time] [timeUnit] ago = Tura Curentă: [civName] de acum [time] [timeUnit]
- # Requires translation!
 Minutes = Minute
- # Requires translation!
 Hours = Ore
- # Requires translation!
 Days = Zile
 
 # Save game menu
@@ -648,48 +499,33 @@ Upload map = Publică harta
 Could not upload map! = Nu s-a putut publica harta
 Map uploaded successfully! = Hartă publicată cu succes
 Saving... = Se salvează...
- # Requires translation!
 Overwrite existing file? = Suprascrie fișîerul existent?
 It looks like your saved game can't be loaded! = Se pare că jocul salvat nu s-a putut incărca!
 If you could copy your game data ("Copy saved game to clipboard" -  = Dacă ai putea copia data jocului ("Copiază jocul salvat în clipboard" - 
   paste into an email to yairm210@hotmail.com) = inserează-l printr-un email la yairm210@hotmail.com)
 I could maybe help you figure out what went wrong, since this isn't supposed to happen! = Poate aș putea să-mi dau seama ce a mers greșit, deoarece asta nu ar trebui să se întâmple!
 Missing mods: [mods] = Mod-uri lipsă: [mods]
- # Requires translation!
 Load from custom location = Încarcă dintr-o locație personalizată
- # Requires translation!
 Could not load game from custom location! = Nu s-a putut încărca jocul din locația personalizată!
- # Requires translation!
 Save to custom location = Salvează într-o locațîe personalizată
- # Requires translation!
 Could not save game to custom location! = Nu s-a putut salva jocul în locația personalizată
 
 # Options
 
 Options = Opțiuni
- # Requires translation!
 About = Despre
- # Requires translation!
 Display = Afișează
- # Requires translation!
 Gameplay = Gameplay
- # Requires translation!
 Sound = Sunet
- # Requires translation!
 Advanced = Avansat
- # Requires translation!
 Locate mod errors = Localizează erorile Mod
- # Requires translation!
 Debug = Depanare
 
- # Requires translation!
 See online Readme = Vezi Readme-ul online
 Turns between autosaves = Ture între salvările automate
 Sound effects volume = Volumul efectelor
 Music volume = Volumul muzicii
- # Requires translation!
 Pause between tracks = Întrerupe între melodii
- # Requires translation!
 Currently playing: [title] = Acum se redă: [title]
 Download music = Descarcă muzică
 Downloading... = Se descarcă...
@@ -703,75 +539,52 @@ Move units with a single tap = Mută unitățile cu o singură apăsare
 Show tutorials = Arată tutorialele
 Auto-assign city production = Alocă automat producția orașelor
 Auto-build roads = Construiește drumuri automat
- # Requires translation!
 Automated workers replace improvements = Muncitorii automatizați înlocuiesc îmbunătățîrile
 Show minimap = Arată miniharta
- # Requires translation!
 off = oprit
 Show pixel units = Arată unitățile
 Show pixel improvements = Arată îmbunătățirile
 Enable nuclear weapons = Permite arme nucleare
- # Requires translation!
-
 Show tile yields = Arată randamentul parcelelor
+ # Requires translation!
 Show unit movement arrows = 
-
 Continuous rendering = Randare continuă
 When disabled, saves battery life but certain animations will be suspended = Când este dezactivată, economisește bateria dar anumite animații vor fi suspendate
 Order trade offers by amount = Comandați oferte comercial după cantitate
- # Requires translation!
 Check extension mods based on vanilla = Verifică Mod-urile de Extindere bazate pe vanilla
- # Requires translation!
 Checking mods for errors... = Se verifică prezența erorilor în mod-uri...
- # Requires translation!
 Show experimental world wrap for maps = Afișează Împachetarea de Lumi experimentală pentru hărți
 HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = ATENȚIUNE - E CÂT SE POATE DE EXPERIMENTAL!
- # Requires translation!
 Enable portrait orientation = Activează orientarea portret
 Generate translation files = Generați fișiere de traducere
 Translation files are generated successfully. = Fișierele de traducere sunt generate cu succes.
- # Requires translation!
 Please note that translations are a community-based work in progress and are INCOMPLETE! The percentage shown is how much of the language is translated in-game. If you want to help translating the game into your language, click here. = Rețîne că traducerile sunt bazate pe comunitatese șî sunt INCOMPLETE! Procentul afișat reprezintă măsura în care a fost tradus jocul într-o anumită limbă. Dacă dorești să ajuți la traducerea jocului în limba ta, dă click aici
 
 # Notifications
 
 Research of [technologyName] has completed! = Cercetarea pentru [technologyName] s-a încheiat!
- # Requires translation!
 [construction] has become obsolete and was removed from the queue in [cityName]! = [construction] a devenit demodat și a fost scos din coadă în [cityName]!
- # Requires translation!
 [construction] has become obsolete and was removed from the queue in [amount] cities! = [construction] a devenit demodat șî a fost scos din coadă în [amount] orașe!
- # Requires translation!
 [cityName] changed production from [oldUnit] to [newUnit] = [cityName] a schimbat producția din [oldUnit] în [newUnit]
- # Requires translation!
 [amount] cities changed production from [oldUnit] to [newUnit] = [amount] orașe au schimbat producția din [oldUnit] în [newUnit]
- # Requires translation!
 Excess production for [wonder] converted to [goldAmount] gold = Producția excesivă pentru [wonder] a fost convertită în [goldAmount] aur
 You have entered a Golden Age! = Ai intrat într-o epocă de aur!
 [resourceName] revealed near [cityName] = [resourceName] a fost dezvăluit lângă [cityName]
- # Requires translation!
 [n] sources of [resourceName] revealed, e.g. near [cityName] = [n] surse de [resourceName] dezvăluite, cum ar fi aproape de [cityName]
 A [greatPerson] has been born in [cityName]! = [cityName] - S-a născut un [greatPerson]!
 We have encountered [civName]! = Am descoperit [civName]!
- # Requires translation!
 [cityStateName] has given us [stats] as a token of goodwill for meeting us = [cityStateName] ne-a oferit [stats] ca o dovadă de bunăvoință pentru că ne-am întâlnit
- # Requires translation!
 [cityStateName] has given us [stats] as we are the first major civ to meet them = [cityStateName] ne-a oferit [stats] doarece suntem prima civilizație majoră pe care i-au întâlnit
- # Requires translation!
 [cityStateName] has also given us [stats] = [cityStateName] ne-a oferit de asemenea [stats]
 Cannot provide unit upkeep for [unitName] - unit has been disbanded! = Nu se poate oferi susținere pentru [unitName] - unitatea a fost desființată!
 [cityName] has grown! = [cityName] a crescut!
 [cityName] is starving! = [cityName] suferă de foame!
 [construction] has been built in [cityName] = [construction] a fost construit(ă) în [cityName]
 [wonder] has been built in a faraway land = [wonder] a fost construit într-un tărâm îndepărtat!
- # Requires translation!
 [civName] has completed [construction]! = [civName] a terminat [construction]!
- # Requires translation!
 An unknown civilization has completed [construction]! = O civilizație necunoscută a terminat [construction]!
- # Requires translation!
 The city of [cityname] has started constructing [construction]! = Orașul [cityname] a început construcția pentru [construction]!
- # Requires translation!
 [civilization] has started constructing [construction]! = [civilization] a început construcția pentru [construction]!
- # Requires translation!
 An unknown civilization has started constructing [construction]! = O civilizație necunoscută a început construcția pentru [construction]!
 Work has started on [construction] = Munca a început pentru [construction]
 [cityName] cannot continue work on [construction] = [cityName] nu poate continua munca la [construction]
@@ -783,11 +596,9 @@ An enemy [unit] has attacked [cityName] = Un [unit] inamic a atacat [cityName]
 An enemy [unit] has attacked our [ourUnit] = Un [unit] inamic ne-a atacat un [ourUnit]
 Enemy city [cityName] has attacked our [ourUnit] = Orașul inamic [cityName] ne-a atacat un [ourUnit]
 An enemy [unit] has captured [cityName] = Un [unit] inamic a capturat [cityName]
- # Requires translation!
 An enemy [unit] has raided [cityName] = Un [unit] inamic a dat un raid în [cityName]
 An enemy [unit] has captured our [ourUnit] = Un [unit] inamic ne-a capturat un [ourUnit]
 An enemy [unit] has destroyed our [ourUnit] = Un [unit] inamic ne-a distrus un [ourUnit]
- # Requires translation!
 Your [ourUnit] has destroyed an enemy [unit] = [ourUnit]ul tău a distrus un [unit] inamic
 An enemy [RangedUnit] has destroyed the defence of [cityName] = Un [RangedUnit] inamic a distrus defensiva orașului [cityName]
 Enemy city [cityName] has destroyed our [ourUnit] = Orașul inamic [cityName] ne-a distrus o unitate [ourUnit]
@@ -799,26 +610,19 @@ Our [attackerName] was attacked by an intercepting [interceptorName] = [attacker
 Our [interceptorName] intercepted and attacked an enemy [attackerName] = [interceptorName] nostru a interceptat și atacat un [attackerName] inamic
 An enemy [unit] was spotted near our territory = Un [unit] inamic a fost reperat în apropierea teritoriului nostru
 An enemy [unit] was spotted in our territory = Un [unit] inamic a fost reperat pe teritoriul nostru
- # Requires translation!
 Your city [cityName] can bombard the enemy! = Orașul tău [cityName] poate bombarda inamicul!
- # Requires translation!
 [amount] of your cities can bombard the enemy! = [amount] dintre orașele tale pot bombarda inamicul!
 [amount] enemy units were spotted near our territory = [amount] unități inamice au fost detectate în aproprierea teritoriului nostru
 [amount] enemy units were spotted in our territory = [amount] unități inamice au fost detectate pe teritoriul nostru
- # Requires translation!
 A(n) [nukeType] exploded in our territory! = O(un) [nukeType] a explodat pe teritoriul nostru!
- # Requires translation!
 After being hit by our [nukeType], [civName] has declared war on us! = După ce a fost lovită de [nukeType], [civName] ne-a declarat război!
 The civilization of [civName] has been destroyed! = Civilizația [civName] a fost distrusă!
 The City-State of [name] has been destroyed! = Orașul-stat [name] a fost distrus!
- # Requires translation!
 Your [ourUnit] captured an enemy [theirUnit]! = [ourUnit]ul tău a capturat un inamic [theirUnit]!
- # Requires translation!
 Your [ourUnit] plundered [amount] [Stat] from [theirUnit] = [ourUnit]ul tău a jefuit [amount] [Stat] de la [theirUnit]
 We have captured a barbarian encampment and recovered [goldAmount] gold! = Am capturat tabăra barbară și am luat [goldAmount] aur!
 A barbarian [unitType] has joined us! = Ni s-a alăturat un [unitType] barbar!
 We have found survivors in the ruins - population added to [cityName] = Am descoperit supraviețuitori printre ruine - populația a fost adăugată la [cityName]
- # Requires translation!
 We have discovered cultural artifacts in the ruins! (+20 Culture) = Am descoperit artefacte culturale în ruine! (+20 Cultură)
 We have discovered the lost technology of [techName] in the ruins! = Am descoperit tehnologia pierdută [techName] printre ruine!
 A [unitName] has joined us! = Un [unitName] ni s-a alăturat!
@@ -1612,7 +1416,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -5333,7 +5137,7 @@ Total War = Război total
  # Requires translation!
 Autocracy Complete = 
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
 Autocracy = Autocrație
 
  # Requires translation!
@@ -8535,8 +8339,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index 431fb8aa0f..2b9217aaf6 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -1174,7 +1174,8 @@ Cities following this religion: = Городов, исповедующих эт
 Click an icon to see the stats of this religion = Нажмите на значок, чтобы просмотреть статистику этой религии
 Religion: Off = Религия: откл.
 Minimal faith required for\nthe next [Great Prophet]: = Необходимое количество веры для того\nчтобы появился следующий [Great Prophet]:
-Religions founded: = Религий основано:
+ # Requires translation!
+Religions to be founded: = 
 Religious status: = Религиозный статус:
 
 None = Нет
@@ -3311,7 +3312,7 @@ Quantity of strategic resources produced by the empire +[amount]% = Количе
 Police State = Полицейское Государство
 Total War = Тотальная Война
 Autocracy Complete = Автократия Завершена
-+[amount]% attack strength to all [unitType] units for [amount2] turns = +[amount]% к силе атаки всем [unitType] юнитам на [amount2] ходов
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = +[amount]% к силе атаки всем [mapUnitFilter] юнитам на [amount2] ходов
 Autocracy = Автократия
 
 United Front = Объединённый Фронт
@@ -5416,7 +5417,6 @@ From a randomly chosen tile [amount] tiles away from the ruins, reveal tiles up
 This Unit gains [amount] XP = Этот юнит получает [amount] ОО
 This Unit upgrades for free including special upgrades = Этот юнит модернизируется бесплатно включая специальные улучшения
 This Unit gains the [promotion] promotion = Этот юнит получает повышение [promotion]
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = +[amount]% к силе атаки для всех юнитов: [mapUnitFilter] на [amount2] ходов
 Hidden before founding a Pantheon = Скрыто до основания пантеона
 Hidden after founding a Pantheon = Скрыто после основания пантеона
 Hidden after generating a Great Prophet = Скрыто после появления Великого Пророка
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index b381b5ca13..8ab17f75d8 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -1188,7 +1188,8 @@ Cities following this religion: = 追随此教的城市
 Click an icon to see the stats of this religion = 点击图标查看宗教统计
 Religion: Off = 宗教：关
 Minimal faith required for\nthe next [Great Prophet]: = 产生下一位[Great Prophet]\n所需的最低信仰
-Religions founded: = 创建的宗教
+ # Requires translation!
+Religions to be founded: = 
 Religious status: = 宗教进度
 
 None = 无
@@ -3322,7 +3323,7 @@ Quantity of strategic resources produced by the empire +[amount]% = 战略资源
 Police State = 极权国家
 Total War = 全面战争
 Autocracy Complete = 完整的独裁政策
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 所有[unitType]单位发起攻击时+[amount]%战斗力（持续[amount2]回合）
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 所有[mapUnitFilter]单位发起攻击时+[amount]%战斗力（持续[amount2]回合）
 Autocracy = 独裁政策
 
 United Front = 统一战线
@@ -5457,8 +5458,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index cea2dbb937..0f395b4cd6 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -1241,7 +1241,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -3402,7 +3402,7 @@ Quantity of strategic resources produced by the empire +[amount]% = Cantidad de
 Police State = Estado de policías
 Total War = Guerra Total
 Autocracy Complete = Autocracia completada
-+[amount]% attack strength to all [unitType] units for [amount2] turns = +[amount]% fuerza de ataque a todas las unidades [unitType] por [amount2] turnos
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = +[amount]% fuerza de ataque a todas las unidades [mapUnitFilter] por [amount2] turnos
 Autocracy = Autocracia
 
 United Front = Frente Unido
@@ -5763,8 +5763,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index c29217e63a..9170085e7e 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -1174,7 +1174,8 @@ 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
 Minimal faith required for\nthe next [Great Prophet]: = Minsta tro som krävs för\nnästa [Great Prophet]:
-Religions founded: = Stiftade Religioner:
+ # Requires translation!
+Religions to be founded: = 
 Religious status: = Religionsstatus:
 
 None = Ingen
@@ -3306,7 +3307,7 @@ Quantity of strategic resources produced by the empire +[amount]% = Mängd strat
 Police State = Polisstat
 Total War = Totalt Krig
 Autocracy Complete = Autokrati Fullbordat
-+[amount]% attack strength to all [unitType] units for [amount2] turns = +[amount]% anfallsstyrka för alla [unitType]-enheter i [amount2] drag
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = +[amount]% anfallsstyrka för alla [mapUnitFilter]-enheter i [amount2] drag
 Autocracy = Autokrati
 
 United Front = Enad Front
@@ -5389,7 +5390,6 @@ From a randomly chosen tile [amount] tiles away from the ruins, reveal tiles up
 This Unit gains [amount] XP = Denna Enhet får [amount] EP
 This Unit upgrades for free including special upgrades = Denna Enhet uppgraderas gratis inklusive specialuppgraderingar
 This Unit gains the [promotion] promotion = Denna Enhet får [promotion]-befordringen
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = +[amount]% attackstyrka för alla [mapUnitFilter]-enheter under [amount2] drag
 Hidden before founding a Pantheon = Gömt innan en Panteon stiftas
 Hidden after founding a Pantheon = Gömt efter en Panteon stiftas
 Hidden after generating a Great Prophet = Gömt efter att en Stor Profet alstrats
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index b04a15b9b6..c8bfb81da5 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -1492,7 +1492,7 @@ Religion: Off =
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
  # Requires translation!
-Religions founded: = 
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -3861,7 +3861,7 @@ Police State = 員警國家
 Total War = 全面戰爭
 Autocracy Complete = 完整的獨裁政策
  # Requires translation!
-+[amount]% attack strength to all [unitType] units for [amount2] turns = 
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = 
 Autocracy = 獨裁政策
 
  # Requires translation!
@@ -6823,8 +6823,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index 863f27a697..b4c8422999 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -1304,7 +1304,8 @@ Click an icon to see the stats of this religion =
 Religion: Off = Din: Kapalı
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
-Religions founded: = Kurulan dinler:
+ # Requires translation!
+Religions to be founded: = 
  # Requires translation!
 Religious status: = 
 
@@ -3561,7 +3562,7 @@ Quantity of strategic resources produced by the empire +[amount]% = İmparatorlu
 Police State = Polis Devleti
 Total War = Topyekün Savaş
 Autocracy Complete = Otokrasi Tamamlandı
-+[amount]% attack strength to all [unitType] units for [amount2] turns = [unitType] birliklere [amount2] turluğuna +%[amount] saldırı gücü
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = [mapUnitFilter] birliklere [amount2] turluğuna +%[amount] saldırı gücü
 Autocracy = Otokrasi
 
 United Front = Birleşik Cephe
@@ -6247,8 +6248,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index 1f4c909be5..4c5e992610 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -1245,7 +1245,8 @@ Click an icon to see the stats of this religion = Натисніть на іко
 Religion: Off = Релігії: вимк
  # Requires translation!
 Minimal faith required for\nthe next [Great Prophet]: = 
-Religions founded: = Релігій може бути засновано:
+ # Requires translation!
+Religions to be founded: = 
 Religious status: = Тип вашої релігії:
 
 None = Немає
@@ -3468,7 +3469,7 @@ Quantity of strategic resources produced by the empire +[amount]% = Імпері
 Police State = Поліційна держава
 Total War = Тотальна війна
 Autocracy Complete = Автократія завершена
-+[amount]% attack strength to all [unitType] units for [amount2] turns = +[amount]% атакуючої сили для всіх [unitType] підрозділів на [amount2] ходів
++[amount]% attack strength to all [mapUnitFilter] units for [amount2] turns = +[amount]% атакуючої сили для всіх [mapUnitFilter] підрозділів на [amount2] ходів
 Autocracy = Автократія
 
 United Front = Об'єднаний фронт
@@ -5856,8 +5857,6 @@ This Unit upgrades for free including special upgrades =
  # Requires translation!
 This Unit gains the [promotion] promotion = 
  # Requires translation!
-+[amount]% attack strength to all [mapUnitFilter] Units for [amount2] turns = 
- # Requires translation!
 Hidden before founding a Pantheon = 
  # Requires translation!
 Hidden after founding a Pantheon = 
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index fc4b5d012d..1c75846e61 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -16,7 +16,7 @@ Brazilian_Portuguese = 52
 Traditional_Chinese = 66
 Polish = 69
 Lithuanian = 17
-Romanian = 26
+Romanian = 31
 Simplified_Chinese = 98
 Bulgarian = 18
 Korean = 83
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 90c5096035..c86c9ac66b 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 = 661
-    const val appVersion = "3.18.12"
+    const val appCodeNumber = 662
+    const val appVersion = "3.18.13"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index 239b8fe2a4..e675dad0e7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,21 @@
+## 3.18.13
+
+Stat names also include the stat icon :)
+
+Better map-to-ruleset incompatibility checks
+
+'tile to expand to' choice incorporates city-specific bonuses
+
+Fixed a ton of very rare, but crashing, edge-case bugs
+
+By will-ca:
+- Save attacks per civ for arrows for cities, missiles, dead units.
+- Solved 'white blocks' on default tileset.
+
+By xlenstra:
+- Fixed a rare diplomacy voting bug in one-more-turn mode
+- Fixed a few combat bugs and changed the religions founded label
+
 ## 3.18.12
 
 AI cities now build workboats for use in other cities