diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties
index 9a4dbc6b28..d3f03a794e 100644
--- a/android/assets/jsons/translations/Afrikaans.properties
+++ b/android/assets/jsons/translations/Afrikaans.properties
@@ -296,10 +296,13 @@ Strategic resources = Strategiese hulpbronne
 Owned by you: [amountOwned] = Besit deur jou: [amountOwned]
 Non-existent city = Nie-bestaande stad
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] nie benodig
-Lost ability = Verlore vermoë
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Nasionale vermoë
 [firstValue] vs [secondValue] = [firstValue] teen [secondValue]
  # Requires translation!
@@ -598,7 +601,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -1082,6 +1085,12 @@ Download music =
 Downloading... = 
  # Requires translation!
 Could not download music! = 
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
  # Requires translation!
@@ -2206,6 +2215,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -3620,9 +3631,9 @@ after discovering [tech] =
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy/belief] = 
  # Requires translation!
-before adopting [policy] = 
+before adopting [policy/belief] = 
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties
index c1d5e5710b..387c2c5437 100644
--- a/android/assets/jsons/translations/Belarusian.properties
+++ b/android/assets/jsons/translations/Belarusian.properties
@@ -402,12 +402,14 @@ Owned by you: [amountOwned] =
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
  # Requires translation!
 [resourceName] not required = 
  # Requires translation!
-Lost ability = 
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
  # Requires translation!
 National ability = 
  # Requires translation!
@@ -825,7 +827,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -1309,6 +1311,12 @@ Download music =
 Downloading... = 
  # Requires translation!
 Could not download music! = 
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
  # Requires translation!
@@ -2433,6 +2441,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -3847,9 +3857,9 @@ after discovering [tech] =
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy/belief] = 
  # Requires translation!
-before adopting [policy] = 
+before adopting [policy/belief] = 
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index f1b3c1a883..cabf6f21fc 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -293,10 +293,13 @@ Strategic resources = Recursos estratégicos
 Owned by you: [amountOwned] = Possuido por você: [amountOwned]
 Non-existent city = Cidade inexistente
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] não requirido
-Lost ability = Habilidade perdida
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Habilidade nacional
 [firstValue] vs [secondValue] = [firstValue] vs [secondValue]
 Gained = Ganhou
@@ -518,7 +521,8 @@ Current map: World Wrap = Mapa atual: Envoltório Mundial
 Overlay image = Imagem de sobreposição
 Click to choose a file = Clique para escolher um arquivo
 Choose an image = Escolha uma imagem
-Overlay transparency: = Transparência de sobreposição:
+ # Requires translation!
+Overlay opacity: = 
 Invalid overlay image = Imagem de sobreposição inválida
 World wrap is incompatible with an overlay and was deactivated. = Envoltório mundial é incompatível com uma sobreposição e foi desativado.
 An overlay image is incompatible with world wrap and was deactivated. = Uma imagem de sobreposição é incompatível com a quebra do mundo e foi desativada.
@@ -784,6 +788,12 @@ Currently playing: [title] = Atualmente tocando: [title]
 Download music = Baixar música
 Downloading... = Baixando...
 Could not download music! = Não foi possível baixar a música!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Avançado
@@ -1380,6 +1390,8 @@ Allied with [civName] = Aliado a [civName]
 Civilization Info = Informações da civilizção
 Relations = Relações
 Trade request = Solicitação de troca
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2130,8 +2142,8 @@ if starting in the [era] = se começar no período [era]
 if no other Civilization has researched this = se nenhuma outra Civilização pesquisou isso
 after discovering [tech] = depois de descobrir [tech]
 before discovering [tech] = antes de descobrir [tech]
-after adopting [policy] = depois de adotar [policy]
-before adopting [policy] = antes de adotar [policy]
+after adopting [policy/belief] = depois de adotar [policy/belief]
+before adopting [policy/belief] = antes de adotar [policy/belief]
 before founding a Pantheon = antes de fundar um Panteão
 after founding a Pantheon = depois de fundar um Panteão
 before founding a religion = antes de fundar uma religião
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index 175c201293..ae3e025700 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -321,10 +321,13 @@ Strategic resources = Стратегически ресурси
 Owned by you: [amountOwned] = Вие имате: [amountOwned]
 Non-existent city = Несъществуващ град
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = Не се изисква [resourceName]
-Lost ability = Загуба на способност
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Способност на нацията
 [firstValue] vs [secondValue] = [firstValue] срещу [secondValue]
  # Requires translation!
@@ -586,7 +589,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -932,6 +935,12 @@ Currently playing: [title] =
 Download music = Изтегляне на музика
 Downloading... = Изтегляне...
 Could not download music! = Невъзможно изтегляне
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Разширени
@@ -1710,6 +1719,8 @@ Civilization Info =
 Relations = Отношения
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2990,9 +3001,9 @@ after discovering [tech] =
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy/belief] = 
  # Requires translation!
-before adopting [policy] = 
+before adopting [policy/belief] = 
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties
index bf8937c8e9..28336c2197 100644
--- a/android/assets/jsons/translations/Catalan.properties
+++ b/android/assets/jsons/translations/Catalan.properties
@@ -293,10 +293,13 @@ Strategic resources = Recursos estratègics
 Owned by you: [amountOwned] = De la vostra propietat: [amountOwned]
 Non-existent city = Ciutat inexistent
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = No necessita el recurs «[resourceName]».
-Lost ability = Habilitat que en comparació no té
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Habilitat nacional
 [firstValue] vs [secondValue] = [firstValue] contra [secondValue]
  # Requires translation!
@@ -526,7 +529,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -798,6 +801,12 @@ Currently playing: [title] = Ara es reprodueix: [title]
 Download music = Descarrega música
 Downloading... = Es descarrega...
 Could not download music! = La música no s’ha pogut descarregar
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Avançat
@@ -1396,6 +1405,8 @@ Allied with [civName] = Aliat de [civName]
 Civilization Info = Informació de la civilització
 Relations = Relacions
 Trade request = Sol·licitud de comerç
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2149,8 +2160,8 @@ if starting in the [era] = si es comença a l’[era]
 if no other Civilization has researched this = si cap altra civilització l’ha recercat
 after discovering [tech] = després de descobrir «[tech]»
 before discovering [tech] = abans de descobrir «[tech]»
-after adopting [policy] = després d’adoptar «[policy]»
-before adopting [policy] = abans d’adoptar «[policy]»
+after adopting [policy/belief] = després d’adoptar «[policy/belief]»
+before adopting [policy/belief] = abans d’adoptar «[policy/belief]»
 before founding a Pantheon = abans de fundar un panteó
 after founding a Pantheon = després de fundar un panteó
 before founding a religion = abans de fundar una religió
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 0698b29634..6e10ce56bd 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -293,10 +293,13 @@ Strategic resources = Strategické suroviny
 Owned by you: [amountOwned] = Vlastněno: [amountOwned]
 Non-existent city = Neexistující město
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] není potřeba
-Lost ability = Ztráta schopnosti
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Národní schopnost
 [firstValue] vs [secondValue] = [firstValue] místo [secondValue]
  # Requires translation!
@@ -526,7 +529,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -810,6 +813,12 @@ Currently playing: [title] = Právě přehrává: [title]
 Download music = Stáhnout hudbu
 Downloading... = Probíhá stahování...
 Could not download music! = Nepodařilo se stáhnout hudbu!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Pokročilé
@@ -1470,6 +1479,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2402,8 +2413,8 @@ if starting in the [era] =
 if no other Civilization has researched this = 
 after discovering [tech] = po objevu technologie [tech]
 before discovering [tech] = před objevem technologie [tech]
-after adopting [policy] = po přijetí politiky [policy]
-before adopting [policy] = před přijetím politiky [policy]
+after adopting [policy/belief] = po přijetí politiky [policy/belief]
+before adopting [policy/belief] = před přijetím politiky [policy/belief]
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index 7e156e3bf1..1791c193d3 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -295,10 +295,13 @@ Strategic resources = Strategische grondstoffen
 Owned by you: [amountOwned] = In je bezit: [amountOwned]
 Non-existent city = Niet bestaande stad
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] niet vereist
-Lost ability = Verloren vaardigheid
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Nationale verdigheid
 [firstValue] vs [secondValue] = [firstValue] vs [secondValue]
  # Requires translation!
@@ -529,7 +532,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -810,6 +813,12 @@ Currently playing: [title] = Momenteel speelt: [title]
 Download music = Download muziek
 Downloading... = Downloading ...
 Could not download music! = Kon de muziek niet downloaden!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Geavanceerd
@@ -1412,6 +1421,8 @@ Allied with [civName] = Geallieerd met [civName]
 Civilization Info = Beschaving informatie
 Relations = Relaties
 Trade request = Handelsverzoek
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2250,8 +2261,8 @@ after discovering [tech] = na ontdekking van [tech]
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
-before adopting [policy] = voor adoptie van [policy]
+after adopting [policy/belief] = 
+before adopting [policy/belief] = voor adoptie van [policy/belief]
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index 584d92a84f..3992bfb181 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -525,12 +525,14 @@ Owned by you: [amountOwned] =
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
  # Requires translation!
 [resourceName] not required = 
  # Requires translation!
-Lost ability = 
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
  # Requires translation!
 National ability = 
  # Requires translation!
@@ -947,7 +949,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -1431,6 +1433,12 @@ Download music =
 Downloading... = 
  # Requires translation!
 Could not download music! = 
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
  # Requires translation!
@@ -2555,6 +2563,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -3970,9 +3980,9 @@ after discovering [tech] =
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy/belief] = 
  # Requires translation!
-before adopting [policy] = 
+before adopting [policy/belief] = 
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index 0ed70fe7cb..16ca42002b 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -297,10 +297,13 @@ Strategic resources = Importanteng mapagkukunan
 Owned by you: [amountOwned] = Pinagmamay-ari mo: [amountOwned]
 Non-existent city = Nawalang lungsod
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] di kinakailangan
-Lost ability = Nawalang kakayahan
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Pambansang Kakayahan
 [firstValue] vs [secondValue] = [firstValue] laban sa [secondValue]
  # Requires translation!
@@ -533,7 +536,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -816,6 +819,12 @@ Currently playing: [title] = Kasalukuyang pinakikinggan: [title]
 Download music = I-download ang musika
 Downloading... = Nagdodownload...
 Could not download music! = Di ma-download ang musika!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Advanced
@@ -1419,6 +1428,8 @@ Allied with [civName] = Kaalyado ni [civName]
 Civilization Info = Kaalaman ukol sa Sibilisasyon
 Relations = Mga Relasyon
 Trade request = Alok sa kalakalan
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2186,8 +2197,8 @@ if starting in the [era] = kapag ito'y nagsisimula sa [era]
 if no other Civilization has researched this = kung walang sibilisasyon na nakasaliksik nito
 after discovering [tech] = pagkatapos madiskubre ang [tech] 
 before discovering [tech] = bago madiskubre ang [tech]
-after adopting [policy] = pagkatapos ipagtibay ang [policy]
-before adopting [policy] = bago magtakda ng [policy]
+after adopting [policy/belief] = pagkatapos ipagtibay ang [policy/belief]
+before adopting [policy/belief] = bago magtakda ng [policy/belief]
 before founding a Pantheon = bago itatag ang isang Panteon
 after founding a Pantheon = pagkatapos itatag ang isang Panteon
 before founding a religion = bago magtatag ng isang relihiyon
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index dafd4253a8..cce5e1b645 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -339,10 +339,13 @@ Owned by you: [amountOwned] =
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = Ei vaadi resurssia [resourceName]
-Lost ability = Unohdettu taito
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Kansallinen taito
 [firstValue] vs [secondValue] = [firstValue], vertaa [secondValue]
  # Requires translation!
@@ -675,7 +678,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -1075,6 +1078,12 @@ Currently playing: [title] =
 Download music = Lataa musiikit
 Downloading... = Lataa...
 Could not download music! = Musiikin lataus epäonnistui!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
  # Requires translation!
@@ -1872,6 +1881,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -3133,9 +3144,9 @@ after discovering [tech] =
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy/belief] = 
  # Requires translation!
-before adopting [policy] = 
+before adopting [policy/belief] = 
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 2098785561..de95dd8428 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -293,15 +293,16 @@ Strategic resources = Ressources stratégiques
 Owned by you: [amountOwned] = Vous avez : [amountOwned]
 Non-existent city = Ville inexistante
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] non requis
-Lost ability = Compétence perdue
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Compétence nationale
 [firstValue] vs [secondValue] = [firstValue] vs [secondValue]
- # Requires translation!
 Gained = Gagne
- # Requires translation!
 Lost = Perd
 
 
@@ -516,21 +517,14 @@ River generation failed! = La génération des rivières a échoué !
 Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = Merci de ne pas utiliser l'étape 'Masse terrestre' avec le type de carte 'Vide', mais plutôt de créer une nouvelle carte vide à la place.
 This map has errors: = Cette carte contient des erreurs :
 The incompatible elements have been removed. = Les éléments incompatibles ont été supprimés.
- # Requires translation!
 Current map: World Wrap = Carte actuelle : Carte sphérique
- # Requires translation!
 Overlay image = Image superposée
- # Requires translation!
 Click to choose a file = Cliquer pour choisir un fichier
- # Requires translation!
 Choose an image = Choisir une image
  # Requires translation!
-Overlay transparency: = Transparence de l'image
- # Requires translation!
+Overlay opacity: = 
 Invalid overlay image = Image non valide
- # Requires translation!
 World wrap is incompatible with an overlay and was deactivated. = La carte sphérique a été désactivée car incompatible avec une image superposée.
- # Requires translation!
 An overlay image is incompatible with world wrap and was deactivated. = L'image superposée a été désactivée car incompatible avec une carte sphérique.
 
 ## Map/Tool names
@@ -794,6 +788,12 @@ Currently playing: [title] = En cours de lecture : [title]
 Download music = Télécharger la musique
 Downloading... = Téléchargement...
 Could not download music! = Impossible de télécharger la musique !
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Avancé
@@ -1231,9 +1231,7 @@ Please select a tile for this building's [improvement] = Veuillez sélectionner
 Invalid input! Please enter a different string. = Entrée non valide ! Veuillez saisir une autre valeur.
 Invalid input! Please enter a valid number. = Entrée non valide ! Veuillez saisir un nombre valide.
 Please enter some text = Veuillez saisir un texte
- # Requires translation!
 Please enter a file name = Veuillez saisir un nom de fichier
- # Requires translation!
 File name: = Nom du fichier :
 
 # Technology UI
@@ -1392,6 +1390,8 @@ Allied with [civName] = Allié avec [civName]
 Civilization Info = Info Civilisation
 Relations = Relations
 Trade request = Échanges proposés
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2142,8 +2142,8 @@ if starting in the [era] = si débute à [era]
 if no other Civilization has researched this = si aucune autre Civilisation n'a recherché ceci
 after discovering [tech] = après avoir découvert [tech]
 before discovering [tech] = avant de découvrir [tech]
-after adopting [policy] = après avoir adopté [policy]
-before adopting [policy] = avant d'adopter [policy]
+after adopting [policy/belief] = après avoir adopté [policy/belief]
+before adopting [policy/belief] = avant d'adopter [policy/belief]
 before founding a Pantheon = avant de fonder un Panthéon
 after founding a Pantheon = après avoir fondé un Panthéon
 before founding a religion = avant de fonder une religion
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 071bcbc488..5a33c2bd64 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -293,10 +293,13 @@ Strategic resources = Strategische Ressourcen
 Owned by you: [amountOwned] = In deinem Besitz: [amountOwned]
 Non-existent city = Nicht-existierende Stadt
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] nicht erforderlich
-Lost ability = Verlorene Fähigkeit
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Nationalfähigkeit
 [firstValue] vs [secondValue] = [firstValue] anstatt [secondValue]
 Gained = Erhalten
@@ -518,7 +521,8 @@ Current map: World Wrap = Aktuelle Karte: World Wrap
 Overlay image = Überlagerungsbild
 Click to choose a file = Anklicken, um eine Datei auszuwählen
 Choose an image = Wähle ein Bild
-Overlay transparency: = Transparenz der Überlagerung
+ # Requires translation!
+Overlay opacity: = 
 Invalid overlay image = Ungültiges Überlagerungsbild
 World wrap is incompatible with an overlay and was deactivated. = World Wrap ist mit einer Überlagerung nicht kompatibel und wurde deaktiviert.
 An overlay image is incompatible with world wrap and was deactivated. = Ein Überlagerungsbild ist nicht mit dem World Wrap kompatibel und wurde deaktiviert.
@@ -784,6 +788,12 @@ Currently playing: [title] = Aktuelle Wiedergabe: [title]
 Download music = Musik herunterladen
 Downloading... = Lade herunter...
 Could not download music! = Musik konnte nicht heruntergeladen werden!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Erweitert
@@ -1380,6 +1390,8 @@ Allied with [civName] = Verbündet mit [civName]
 Civilization Info = Zivilisations-Informationen
 Relations = Beziehungen
 Trade request = Handelsanfrage
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2130,8 +2142,8 @@ if starting in the [era] = wenn mit der [era] gestartet wird
 if no other Civilization has researched this = wenn keine andere Zivilisation dies bereits erforscht hat
 after discovering [tech] = nach dem Entdecken von [tech]
 before discovering [tech] = vor dem Entdecken von [tech]
-after adopting [policy] = nach dem Verabschieden von [policy]
-before adopting [policy] = vor dem Verabschieden von [policy]
+after adopting [policy/belief] = nach dem Verabschieden von [policy/belief]
+before adopting [policy/belief] = vor dem Verabschieden von [policy/belief]
 before founding a Pantheon = vor der Gründung eines Pantheons
 after founding a Pantheon = nach der Gründung eines Pantheons
 before founding a religion = vor der Gründung einer Religion
diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties
index fbd97246fb..9978d25143 100644
--- a/android/assets/jsons/translations/Greek.properties
+++ b/android/assets/jsons/translations/Greek.properties
@@ -417,12 +417,14 @@ Owned by you: [amountOwned] =
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
  # Requires translation!
 [resourceName] not required = 
  # Requires translation!
-Lost ability = 
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
  # Requires translation!
 National ability = 
  # Requires translation!
@@ -770,7 +772,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -1217,6 +1219,12 @@ Currently playing: [title] =
 Download music = Κατέβασε μουσική
 Downloading... = Κατεβαίνει...
 Could not download music! = Η μουσική δεν μπόρεσε να κατεβεί!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
  # Requires translation!
@@ -2222,6 +2230,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -3584,9 +3594,9 @@ after discovering [tech] =
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy/belief] = 
  # Requires translation!
-before adopting [policy] = 
+before adopting [policy/belief] = 
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 3f304cf0f8..bd73dc4fdc 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -293,10 +293,13 @@ Strategic resources = Stratégiai erőforrások
 Owned by you: [amountOwned] = Ennyi van neked: [amountOwned]
 Non-existent city = Nem létező város
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] nem szükséges
-Lost ability = Elvesztett képesség
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Nemzeti képesség
 [firstValue] vs [secondValue] = [firstValue], [secondValue] helyett
  # Requires translation!
@@ -527,7 +530,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -808,6 +811,12 @@ Currently playing: [title] = Ez szól most: [title]
 Download music = Zene letöltése
 Downloading... = Letöltés...
 Could not download music! = Zene letöltése sikertelen
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Haladó
@@ -1407,6 +1416,8 @@ Allied with [civName] = Szövetségben vele: [civName]
 Civilization Info = Civilizációadatok
 Relations = Kapcsolatok
 Trade request = Kereskedelmi ajánlat
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2170,8 +2181,8 @@ if starting in the [era] = ha a [era]ban kezdődik a játék
 if no other Civilization has researched this = ha még nem találta fel ezt más civilizáció
 after discovering [tech] = [tech] feltalálása után
 before discovering [tech] = a(z) [tech] feltalálása előtt
-after adopting [policy] = a(z) [policy] beiktatása után
-before adopting [policy] = a(z) [policy] beiktatása előtt
+after adopting [policy/belief] = a(z) [policy/belief] beiktatása után
+before adopting [policy/belief] = a(z) [policy/belief] beiktatása előtt
 before founding a Pantheon = a panteon megalapítása előtt
 after founding a Pantheon = a panteon megalapítása után
 before founding a religion = a vallás megalapítása előtt
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 08d34d68c8..c5bdcc3555 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -293,10 +293,13 @@ Strategic resources = Sumber daya strategis
 Owned by you: [amountOwned] = Dimiliki kamu: [amountOwned]
 Non-existent city = Kota yang tidak ada lagi
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] tidak dibutuhkan
-Lost ability = Kemampuan hilang
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Kemampuan nasional
 [firstValue] vs [secondValue] = [firstValue] vs [secondValue]
  # Requires translation!
@@ -526,7 +529,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -798,6 +801,12 @@ Currently playing: [title] = Saat ini memutar: [title]
 Download music = Unduh lagu
 Downloading... = Mengunduh...
 Could not download music! = Tidak dapat mengunduh musik!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Lanjutan
@@ -1396,6 +1405,8 @@ Allied with [civName] = Bersekutu dengan [civName]
 Civilization Info = Info Peradaban
 Relations = Relasi
 Trade request = Permintaan perdagangan
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2146,8 +2157,8 @@ if starting in the [era] = jika memulai dari [era]
 if no other Civilization has researched this = jika tidak ada Peradaban lain yang telah meriset ini
 after discovering [tech] = setelah menemukan [tech]
 before discovering [tech] = sebelum menemukan [tech]
-after adopting [policy] = setelah menerapkan [policy]
-before adopting [policy] = sebelum menerapkan [policy]
+after adopting [policy/belief] = setelah menerapkan [policy/belief]
+before adopting [policy/belief] = sebelum menerapkan [policy/belief]
 before founding a Pantheon = sebelum menemukan kepercayaan
 after founding a Pantheon = setelah menemukan kepercayaan
 before founding a religion = sebelum mendirikan agama
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index 6dfdabe189..3cf516a872 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -296,10 +296,13 @@ Strategic resources = Risorse strategiche
 Owned by you: [amountOwned] = In tuo possesso: [amountOwned]
 Non-existent city = Città inesistente
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = Risorsa [resourceName] non richiesta
-Lost ability = Non possiede 
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Abilità della civiltà
 [firstValue] vs [secondValue] = [firstValue] vs [secondValue]
 Gained = Ottieni
@@ -522,7 +525,8 @@ Current map: World Wrap = Mappa attuale: Mondo rotondo
 Overlay image = Immagine sfondo
 Click to choose a file = Clicca per scegliere un file
 Choose an image = Scegli un'immagine
-Overlay transparency: = Trasparenza sfondo
+ # Requires translation!
+Overlay opacity: = 
 Invalid overlay image = Immagine sfondo non valida
 World wrap is incompatible with an overlay and was deactivated. = Il Mondo rotondo è stato disattivato perché incompatibile con lo sfondo
 An overlay image is incompatible with world wrap and was deactivated. = L'immagine è stata disattivata perché incompatibile con il Mondo rotondo
@@ -788,6 +792,12 @@ Currently playing: [title] = Traccia in riproduzione: [title]
 Download music = Scarica musica
 Downloading... = Download in corso...
 Could not download music! = Impossibile scaricare musica!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Avanzate
@@ -1386,6 +1396,8 @@ Allied with [civName] = Alleanza con [civName]
 Civilization Info = Info civiltà
 Relations = Rapporti
 Trade request = Richiesta commerciale
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2137,8 +2149,8 @@ if starting in the [era] = se inizi nell'[era]
 if no other Civilization has researched this = se nessun'altra civiltà l'ha scoperta
 after discovering [tech] = quando scopri [tech]
 before discovering [tech] = finché non scopri [tech]
-after adopting [policy] = quando adotti [policy]
-before adopting [policy] = prima di adottare [policy]
+after adopting [policy/belief] = quando adotti [policy/belief]
+before adopting [policy/belief] = prima di adottare [policy/belief]
 before founding a Pantheon = prima di fondare un Pantheon
 after founding a Pantheon = dopo aver fondato un Pantheon
 before founding a religion = prima di fondare una religione
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index 1db87ce4fe..59e3c50836 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -293,10 +293,13 @@ Strategic resources = 戦略資源
 Owned by you: [amountOwned] = [amountOwned]を持っている
 Non-existent city = 存在しない都市
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName]が不要
-Lost ability = 失う能力
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = 文明能力
 [firstValue] vs [secondValue] = [secondValue]→[firstValue]
  # Requires translation!
@@ -529,7 +532,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -755,13 +758,11 @@ Experimental Demographics scoreboard = デモグラフィックスコアを表
 
 ### Visual Hints subgroup
 
- # Requires translation!
 Visual Hints = ビジュアルヒント
 Show worked tiles = 市民の配置を表示
 Show resources and improvements = 資源とタイル整備を表示
 Show tile yields = タイルの産出量を表示
 Show unit movement arrows = ユニットの動きを矢印で表示
- # Requires translation!
 Show suggested city locations for units that can found cities = 都市を建設できるタイルの提案を表示
 Show pixel units = ユニットの絵を表示
 Show pixel improvements = タイル整備の絵を表示
@@ -803,6 +804,12 @@ Currently playing: [title] = 再生中の曲: [title]
 Download music = 音楽をダウンロード
 Downloading... = ダウンロード中...
 Could not download music! = 音楽をダウンロードできませんでした
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = 拡張設定
@@ -1033,7 +1040,6 @@ You may choose a free Policy = 無償の社会制度を採用できます
 You may choose [amount] free Policies = 無償で[amount]個の社会制度を採用できます
  # Requires translation!
 You gain the [policy] Policy = 
- # Requires translation!
 You enter a Golden Age = あなたの文明は黄金時代に入りました
  # Requires translation!
 You have gained [amount] [resourceName] = 
@@ -1310,7 +1316,6 @@ Temporary Bonus = 一時的ボーナス
 Garrisoned unit = 駐留中のユニット
 Attacking Bonus = 攻撃ボーナス
 defence vs [unitType] = 対[unitType]防御
- # Requires translation!
 [tileFilter] defence = [tileFilter]上での防御
 Defensive Bonus = 防御ボーナス
  # Requires translation!
@@ -1347,7 +1352,6 @@ Total = 合計
 Stats = 統計
 Policies = 社会制度
 Base happiness = 基本幸福度
- # Requires translation!
 Traded Luxuries = 取引中の高級資源
 City-State Luxuries = 都市国家からの高級資源
 Occupied City = 占領都市
@@ -1432,17 +1436,17 @@ Allied with [civName] = [civName]と同盟関係
 Civilization Info = 文明
 Relations = 関係
 Trade request = 取引オファー
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
 [victoryType] Victory = [victoryType]勝利
 Built [building] = [building]を建設する
 Add all [comment] in capital = すべての[comment]を首都に運搬
- # Requires translation!
 Destroy all players = すべてのプレイヤーを撃破
  # Requires translation!
 Capture all capitals = 
- # Requires translation!
 Complete [amount] Policy branches = [amount]系統の社会制度をコンプリート
 You have won a [victoryType] Victory! = あなたの文明は[victoryType]勝利しました！
 [civilization] has won a [victoryType] Victory! = [civilization]が[victoryType]勝利しました！
@@ -1480,7 +1484,6 @@ Vote for [civilizationName] = [civilizationName]に投票
 Continue = 続ける
 Abstained = 棄権
 Vote for World Leader = 世界の主導者の投票
- # Requires translation!
 Replay = リプレイ
 
 # Capturing a city
@@ -1611,50 +1614,31 @@ Granted by [param] =
 Granted by: = 
 [bonus] with [tech] = [tech]で[bonus]
 Difficulty levels = 難易度レベル 
- # Requires translation!
 The possible rewards are: = 受け取れるボーナス:
 Eras = 時代
- # Requires translation!
 Embarked strength: [amount]† = 乗船時戦闘力: [amount]†
- # Requires translation!
 Base unit buy cost: [amount]¤ = 基本ユニットコスト: [amount]¤
- # Requires translation!
 Research agreement cost: [amount]¤ = 研究協定コスト: [amount]¤
- # Requires translation!
 Speeds = ゲーム速度
- # Requires translation!
 General speed modifier: [amount]%⏳ = 基本ゲーム速度: [amount]%⏳
- # Requires translation!
 Production cost modifier: [amount]%⚙ = 生産力: [amount]%⚙
- # Requires translation!
 Gold cost modifier: [amount]%¤ = ゴールド: [amount]%¤
- # Requires translation!
 Science cost modifier: [amount]%⍾ = 科学力: [amount]%⍾
- # Requires translation!
 Culture cost modifier: [amount]%♪ = 文化力: [amount]%♪
- # Requires translation!
 Faith cost modifier: [amount]%☮ = 信仰力: [amount]%☮
- # Requires translation!
 Improvement build length modifier: [amount]%⏳ = タイル整備: [amount]%⏳
- # Requires translation!
 Diplomatic deal duration: [amount] turns⏳ = 外交的取引の提供期間: [amount]ターン⏳
- # Requires translation!
 Gold gift influence gain modifier: [amount]%¤ = ゴールドの寄付による影響力の持続期間: [amount]%¤
  # Requires translation!
 City-state tribute scaling interval: [amount] turns⏳ = 
- # Requires translation!
 Barbarian spawn modifier: [amount]%† = 蛮族の再出現までの時間: [amount]%†
- # Requires translation!
 Golden age length modifier: [amount]%⌣ = 黄金時代の長さ: [amount]%⌣
  # Requires translation!
 Adjacent city religious pressure: [amount]☮ = 
- # Requires translation!
 Peace deal duration: [amount] turns⏳ = 平和条約の提供期間: [amount]ターン⏳
- # Requires translation!
 Start year: [comment] = ゲーム開始年: [comment]
 Pillaging this improvement yields [stats] = 略奪で[stats]を入手
 Pillaging this improvement yields approximately [stats] = 略奪で約[stats]を入手
- # Requires translation!
 Needs removal of terrain features to be built = 整備前にタイル要素の削除が必要
 Unit type = ユニットタイプ
 Units: = ユニット
@@ -1947,7 +1931,6 @@ ConditionalsPlacement = before
 
 #################### Lines from Unique Types #######################
 
- # Requires translation!
 [stats] = [stats]
 [stats] [cityFilter] = [cityFilter][stats]
 [stats] from every specialist [cityFilter] = [cityFilter]専門家あたり[stats]
@@ -1968,7 +1951,6 @@ Ensures a minimum tile yield of [stats] =
 [relativeAmount]% [stat] [cityFilter] = [cityFilter][stat][relativeAmount]%
 [relativeAmount]% [stat] from every [tileFilter/buildingFilter] = [tileFilter/buildingFilter]が[stat][relativeAmount]%の効果を得る
 [relativeAmount]% Yield from every [tileFilter/buildingFilter] = [tileFilter/buildingFilter]の産出量[relativeAmount]%
- # Requires translation!
 [relativeAmount]% [stat] from every follower, up to [relativeAmount2]% =  信徒1人あたり[stat][relativeAmount]%（最大[relativeAmount2]%まで）
 [relativeAmount]% [stat] from City-States = 都市国家からの[stat][relativeAmount]% 
 [relativeAmount]% [stat] from Trade Routes = 交易路からの[stat][relativeAmount]% 
@@ -1977,7 +1959,6 @@ Nullifies Growth [cityFilter] = [cityFilter]成長を無効化
 [relativeAmount]% Production when constructing [buildingFilter] buildings [cityFilter] = [cityFilter][buildingFilter]の建物の建築時に生産力[relativeAmount]%
 [relativeAmount]% Production when constructing [baseUnitFilter] units [cityFilter] = [cityFilter][baseUnitFilter]ユニットの生産時に生産力[relativeAmount]%
 [relativeAmount]% Production when constructing [buildingFilter] wonders [cityFilter] = [cityFilter][buildingFilter]の遺産の建築時に生産力[relativeAmount]%
- # Requires translation!
 [relativeAmount]% Production towards any buildings that already exist in the Capital = すでに首都で建設済みの建物を他の都市で建設するとき、生産力[relativeAmount]%
 Provides military units every ≈[amount] turns = 約[amount]ターンごとの軍事ユニットの贈呈
 Provides a unique luxury = 固有の高級資源が提供される
@@ -2044,21 +2025,17 @@ Each city founded increases culture cost of policies [relativeAmount]% less than
 [relativeAmount]% Culture cost of adopting new Policies = 新しい社会制度の採用に必要な文化力を[relativeAmount]%抑える
 Quantity of strategic resources produced by the empire +[relativeAmount]% = 戦略資源の生産量+[relativeAmount]%
 Double quantity of [resource] produced = [resource]の生産量が2倍
- # Requires translation!
 [stats] for every known Natural Wonder = 発見済みの自然遺産1件あたり[stats]
 Enables construction of Spaceship parts = 宇宙船のパーツの構築ができる
 Enemy [mapUnitFilter] units must spend [amount] extra movement points when inside your territory = あなたの領土内で敵の[mapUnitFilter]ユニットの移動ポイントの消費が[amount]増加する
- # Requires translation!
 Notified of new Barbarian encampments = 新しい蛮族の野営地が出現したときに通知
 "Borrows" city names from other civilizations in the game = 都市の建設時に他の文明の都市名を借りる
 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it) = 自然遺産を発見すると100ゴールド（最初に見つけた文明ならば500ゴールド）を与えられる
 Unhappiness from number of Cities doubled = 都市の数からの不満が2倍
 Great General provides double combat bonus = 大将軍による戦闘ボーナスが2倍
 Receive a tech boost when scientific buildings/wonders are built in capital = 首都に科学関連の建造物/遺産が建設されると、科学力が増大する。
- # Requires translation!
 May not generate great prophet equivalents naturally = 大預言者が自動生成されない
 When conquering an encampment, earn [amount] Gold and recruit a Barbarian unit = 蛮族の野営地を制圧時に[amount]ゴールドを入手し、蛮族が入隊する
- # Requires translation!
 When defeating a [mapUnitFilter] unit, earn [amount] Gold and recruit it = [mapUnitFilter]ユニットを破壊時に[amount]ゴールドを入手し、そのユニットが入隊する
 Receive triple Gold from Barbarian encampments and pillaging Cities = 野営地と都市からの略奪で出るゴールドが3倍になる
 Cities are razed [amount] times as fast = 都市の焼却速度が[amount]倍
@@ -2089,7 +2066,6 @@ Triggers a Cultural Victory upon completion = 完成すると文化勝利を収
 [relativeAmount]% Strength for cities = 都市の耐久力[relativeAmount]%
 New [baseUnitFilter] units start with [amount] Experience [cityFilter] = [cityFilter]新しい[baseUnitFilter]ユニットが始めからXP[amount]
 All newly-trained [baseUnitFilter] units [cityFilter] receive the [promotion] promotion = [cityFilter]すべての新しい[baseUnitFilter]ユニットが[promotion]を得る
- # Requires translation!
 [baseUnitFilter] units built [cityFilter] can [action] [amount] extra times = [cityFilter]建設後、[baseUnitFilter]は追加で[amount]回[action]ことができる
 Enables embarkation for land units = 地上ユニットの乗船が可能になる
 Enables [mapUnitFilter] units to enter ocean tiles = [mapUnitFilter]ユニットが水上タイルに移動できる
@@ -2118,13 +2094,11 @@ Requires at least [amount] population = 最低でも人口が[amount]必要
 Triggers a global alert upon build start = 生産を開始すると警告が発生する
 Triggers a global alert upon completion = 生産を完了すると警告が発生する
 Cost increases by [amount] per owned city = 所有する都市ごとにコストが[amount]増加
- # Requires translation!
 Requires a [buildingFilter] in at least [amount] cities = 都市に最低[amount]個の[buildingFilter]の建物が必要 
 Can only be built [cityFilter] = [cityFilter]のみで建設可能
 Must have an owned [tileFilter] within [amount] tiles = [amount]タイル以内に[tileFilter]がなければならない
 Enables nuclear weapon = 核兵器を生産できる
 Must not be on [tileFilter] = [tileFilter]の上ではできない
- # Requires translation!
 Must not be next to [tileFilter] = [tileFilter]に隣接したタイルの上ではできない
 Indicates the capital city = 首都を指し示す
 Provides 1 extra copy of each improved luxury resource near this City = この都市付近で活用されているすべての高級資源を、もう1つずつ追加で提供
@@ -2306,7 +2280,6 @@ Can also be built on tiles adjacent to fresh water = 淡水源に隣接したタ
 Can be built outside your borders = 国境外でも建設可能
 Can be built just outside your borders = 国境のすぐ外に建てられる
 Can only be built to improve a resource = タイル整備でのみ建設可能
- # Requires translation!
 Removes removable features when built = 整備時に削除できるタイル要素を削除する
 Gives a defensive bonus of [relativeAmount]% = [relativeAmount]％の防御ボーナスを付与
  # Requires translation!
@@ -2315,7 +2288,6 @@ Costs [amount] [stat] per turn when in your territory =
 Costs [amount] [stat] per turn = 
 Adjacent enemy units ending their turn take [amount] damage = ターン終了時に隣接する敵ユニットは[amount]ダメージを受ける
 Great Improvement = 偉人のタイル整備
- # Requires translation!
 Provides a random bonus when entered = ランダムでボーナスが入手できる
  # Requires translation!
 Constructing it will take over the tiles around it and assign them to your closest city = 
@@ -2345,8 +2317,8 @@ if starting in the [era] = [era]から開始した場合
 if no other Civilization has researched this = 他の文明がこのテクノロジーをまだ研究していない場合
 after discovering [tech] = [tech]を研究してから
 before discovering [tech] = [tech]を研究するまで
-after adopting [policy] = [policy]を採用してから
-before adopting [policy] = [policy]を採用するまで
+after adopting [policy/belief] = [policy/belief]を採用してから
+before adopting [policy/belief] = [policy/belief]を採用するまで
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
@@ -2461,7 +2433,6 @@ This Unit upgrades for free including special upgrades =
 This Unit gains the [promotion] promotion = 
 Doing so will consume this opportunity to choose a Promotion = 昇進する機会を失うことになる
 Provides the cheapest [stat] building in your first [amount] cities for free = 最初の[amount]つまでの都市に最も安い[stat]の建物が無償で手に入る
- # Requires translation!
 Provides a [buildingName] in your first [amount] cities for free = 最初の[amount]つまでの都市に[buildingName]が無償で手に入る
  # Requires translation!
 upon discovering [tech] = 
@@ -4526,20 +4497,16 @@ squatters willing to work for you =
 squatters wishing to settle under your rule = 
 
 An ancient tribe trained us in their ways of combat! = 遺跡に住む民が我々のユニットに戦闘を指導しました！
- # Requires translation!
 your exploring unit receives training = ユニットが戦闘指導を受ける
 
 We have found survivors in the ruins! Population added to [cityName]. = 遺跡から生存者を発見し、[cityName]の市民になりました
- # Requires translation!
 survivors (adds population to a city) = 生存者（都市の市民になる）
 
- # Requires translation!
 a stash of gold = 金の山を発見
 
 discover a lost technology = 失われた技術を発見
 
 Our unit finds advanced weaponry hidden in the ruins! = 遺跡から先進の武器を発見しました！
- # Requires translation!
 advanced weaponry for your explorer = 先進の武器
 
 You find evidence of Barbarian activity. Nearby Barbarian camps are revealed! = 蛮族の行動の痕跡を発見しました。近くの蛮族の野営地の場所が判明しました
@@ -6387,67 +6354,36 @@ Gisgo =
  # Requires translation!
 Fierelus = 
 Carthage = カルタゴ
- # Requires translation!
 Utique = ウーティカ
- # Requires translation!
 Hippo Regius = ヒッポ・レジウス
- # Requires translation!
 Gades = カディス
- # Requires translation!
 Saguntum = サグント
- # Requires translation!
 Carthago Nova = カルタゴ・ノバ
- # Requires translation!
 Panormus = パノルムス
- # Requires translation!
 Lilybaeum = リリベウム
- # Requires translation!
 Hadrumetum = ハドルメトゥム
- # Requires translation!
 Zama Regia = ザーマ・レジア
- # Requires translation!
 Karalis = カラリス
- # Requires translation!
 Malaca = マラッカ
- # Requires translation!
 Leptis Magna = レプティス・マグナ
- # Requires translation!
 Hippo Diarrhytus = ヒッポ・ディアリトス
- # Requires translation!
 Motya = モティア
- # Requires translation!
 Sulci = スルキ
- # Requires translation!
 Leptis Parva = レプティス・パルバ
- # Requires translation!
 Tharros = タロス
- # Requires translation!
 Soluntum = ソロス
- # Requires translation!
 Lixus = リクス
- # Requires translation!
 Oea = イーア
- # Requires translation!
 Theveste = テベッサ
- # Requires translation!
 Ibossim = イビサ
- # Requires translation!
 Thapsus = タプスス
- # Requires translation!
 Aleria = アレリア
- # Requires translation!
 Tingis = ティンギス
- # Requires translation!
 Abyla = アビラ
- # Requires translation!
 Sabratha = サブラタ
- # Requires translation!
 Rusadir = ルサディル
- # Requires translation!
 Baecula = ベキュラ
- # Requires translation!
 Saldae = サルデー
- # Requires translation!
 Units ending their turn on [tileFilter] tiles take [amount] damage = ターン終了時、[tileFilter]タイル上のユニットに[amount]ダメージ
 
 Theodora = テオドラ
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index b862010870..6405b41113 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -295,10 +295,13 @@ Strategic resources = 전략 자원
 Owned by you: [amountOwned] = 보유중인 자원: [amountOwned]
 Non-existent city = 없는 도시
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] 자원이 불필요함
-Lost ability = 없어진 특성
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = 문명 특성
 [firstValue] vs [secondValue] = [firstValue] vs [secondValue] 
  # Requires translation!
@@ -533,7 +536,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -834,6 +837,12 @@ Currently playing: [title] = 재생 중: [title]
 Download music = 음악 다운로드
 Downloading... = 다운로드 중...
 Could not download music! = 음악을 다운로드 할 수 없습니다!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = 고급
@@ -1450,6 +1459,8 @@ Allied with [civName] = [civName]의 동맹
 Civilization Info = 문명 정보
 Relations = 관계
 Trade request = 거래 요청
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2233,8 +2244,8 @@ if starting in the [era] = [era] 시대로 시작시
 if no other Civilization has researched this = 이 기술을 연구한 다른 문명이 없을 때
 after discovering [tech] = [tech] 연구 후
 before discovering [tech] = [tech] 연구 전
-after adopting [policy] = [policy] 채택 후
-before adopting [policy] = [policy] 채택 전
+after adopting [policy/belief] = [policy/belief] 채택 후
+before adopting [policy/belief] = [policy/belief] 채택 전
 before founding a Pantheon = 종교관 선택 전
 after founding a Pantheon = 종교관 선택 후
  # Requires translation!
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index 650159733f..80144ce86c 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -296,10 +296,13 @@ Strategic resources = Strateginiai resursai
 Owned by you: [amountOwned] = Jūsų nuosavybė: [amountOwned] 
 Non-existent city = Neegzistuojantis miestas
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] nereikalaujama(s)
-Lost ability = Prarastas sugebėjimas
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Nacionalinis ypatumas
 [firstValue] vs [secondValue] = [firstValue] sulyg: [secondValue]
  # Requires translation!
@@ -554,7 +557,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -867,6 +870,12 @@ Currently playing: [title] = Dabar groja: [title]
 Download music = Atsisiųsti muziką
 Downloading... = Atsisiunčiama...
 Could not download music! = Nepavyko atsisiųsti muzikos!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Papildomi
@@ -1506,6 +1515,8 @@ Allied with [civName] = Sąjungininkai su: [civName]
 Civilization Info = Civilizacijos informacija
 Relations = Ryšiai
 Trade request = Siūlymas prekiauti
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2309,8 +2320,8 @@ if starting in the [era] =
 if no other Civilization has researched this = jei to neatrado kita civilizacija
 after discovering [tech] = po: [tech] atradimo
 before discovering [tech] = iki [tech] atradimo
-after adopting [policy] = priėmus: [policy]
-before adopting [policy] = prieš priimant [policy]
+after adopting [policy/belief] = priėmus: [policy/belief]
+before adopting [policy/belief] = prieš priimant [policy/belief]
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index ed58b533d6..8480ae48b9 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -377,10 +377,13 @@ Owned by you: [amountOwned] =
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] tidak diperlukan
-Lost ability = Hilang kemampuan
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Kemampuan kebangsaan
 [firstValue] vs [secondValue] = [firstValue] lawan [secondValue]
  # Requires translation!
@@ -701,7 +704,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -1107,6 +1110,12 @@ Currently playing: [title] =
 Download music = Muat turun muzik
 Downloading... = Sedang dimuat-turunkan...
 Could not download music! = Tidak dapat memuat-turunkan muzik!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
  # Requires translation!
@@ -1910,6 +1919,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -3142,9 +3153,9 @@ after discovering [tech] =
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy/belief] = 
  # Requires translation!
-before adopting [policy] = 
+before adopting [policy/belief] = 
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index 60d635aee7..9cf60994d6 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -409,10 +409,13 @@ Owned by you: [amountOwned] =
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = Niāzi be [resourceName] nist
-Lost ability = Tavānāi az dast rafte
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Tavānāi melli
 [firstValue] vs [secondValue] = [firstValue] bar alayh e [secondValue]
  # Requires translation!
@@ -761,7 +764,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -1181,6 +1184,12 @@ Currently playing: [title] =
 Download music = Dānlod e mosiği
 Downloading... = Dar hāl e dānlod...
 Could not download music! = Mosiği dānlod našod!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
  # Requires translation!
@@ -2051,6 +2060,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -3363,9 +3374,9 @@ after discovering [tech] =
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy/belief] = 
  # Requires translation!
-before adopting [policy] = 
+before adopting [policy/belief] = 
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index 39be748dc9..775564150d 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -370,10 +370,13 @@ Owned by you: [amountOwned] = Daryaai e shoma: [amountOwned]
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = Niaazi be [resourceName] nist
-Lost ability = Tavaanaai az dast rafte
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Tavaanaai melli
 [firstValue] vs [secondValue] = [firstValue] bar alayh e [secondValue]
  # Requires translation!
@@ -704,7 +707,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -1111,6 +1114,12 @@ Currently playing: [title] =
 Download music = Daanlod e mosighi
 Downloading... = Dar haal e daanlod...
 Could not download music! = Mosighi daanlod nashod!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
  # Requires translation!
@@ -1980,6 +1989,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -3292,9 +3303,9 @@ after discovering [tech] =
  # Requires translation!
 before discovering [tech] = 
  # Requires translation!
-after adopting [policy] = 
+after adopting [policy/belief] = 
  # Requires translation!
-before adopting [policy] = 
+before adopting [policy/belief] = 
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index 39fd4615fe..b88d26283c 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -293,15 +293,16 @@ Strategic resources = Surowce strategiczne
 Owned by you: [amountOwned] = Posiadane: [amountOwned]
 Non-existent city = Nie istniejące miasto
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = Nie wymaga: [resourceName] 
-Lost ability = Utracona zdolność
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Zdolność narodowa
 [firstValue] vs [secondValue] = [firstValue] zamiast [secondValue]
- # Requires translation!
 Gained = Uzyskano
- # Requires translation!
 Lost = Utracono
 
 
@@ -383,7 +384,6 @@ Sparse = Rzadkie
 Abundant = Liczne
 Strategic Balance = Balans strategiczny
 Legendary Start = Legendarny początek
- # Requires translation!
 This is used for painting resources, not in map generator steps: = Dotyczy to używania pędzla, nie Generatora Kroków:
 
 Advanced Settings = Opcje zaawansowane
@@ -517,21 +517,14 @@ River generation failed! = Generowanie rzeki nie powiodło się!
 Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = Proszę nie używać kroku 'Ląd' z typem mapy 'Pusta'. Zamiast tego należy utworzyć nową pustą mapę.
 This map has errors: = Ta mapa zawiera błędy:
 The incompatible elements have been removed. = Niepasujące elementy zostały usunięte.
- # Requires translation!
 Current map: World Wrap = Aktualna mapa: Zawijanie Świata
- # Requires translation!
 Overlay image = Obraz nakładki
- # Requires translation!
 Click to choose a file = Kliknij żeby wybrać plik 
- # Requires translation!
 Choose an image = Wybierz obraz
  # Requires translation!
-Overlay transparency: = Przeźroczystość okładki
- # Requires translation!
+Overlay opacity: = 
 Invalid overlay image = Nieprawidłowy obraz nakładki 
- # Requires translation!
 World wrap is incompatible with an overlay and was deactivated. = Zawijanie Świata jest niezgodne z nakładką i zostało wyłączone
- # Requires translation!
 An overlay image is incompatible with world wrap and was deactivated. = Obraz nakładki jest niezgodny z Zawijaniem Świata i został wyłączony 
 
 ## Map/Tool names
@@ -796,6 +789,12 @@ Currently playing: [title] = Aktualnie odtwarzam: [title]
 Download music = Pobierz muzykę 
 Downloading... = Pobieranie...
 Could not download music! = Nie można pobrać muzyki!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Zaawansowane
@@ -1234,9 +1233,7 @@ Please select a tile for this building's [improvement] = Proszę wybrać pole dl
 Invalid input! Please enter a different string. = Niepoprawne dane! Wprowadź inny tekst.
 Invalid input! Please enter a valid number. = Niepoprawne dane! Wprowadź inną liczbę.
 Please enter some text = Proszę wprowadzić jakiś tekst
- # Requires translation!
 Please enter a file name = Proszę wprowadzić nazwę pliku
- # Requires translation!
 File name: = Nazwa pliku:
 
 # Technology UI
@@ -1395,6 +1392,8 @@ Allied with [civName] = Sojusz z: [civName]
 Civilization Info = Cywilizacje
 Relations = Relacje
 Trade request = Zapotrzebowanie na handel
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2147,8 +2146,8 @@ if starting in the [era] = jeśli zaczyna się w [era]
 if no other Civilization has researched this = kiedy żadna inna Cywilizacja jeszcze tego nie odkryła
 after discovering [tech] = po odkryciu → [tech]
 before discovering [tech] = przed odkryciem → [tech]
-after adopting [policy] = po przyjęciu ustroju → [policy]
-before adopting [policy] = jeśli wcześniej nie wybrano ustroju → [policy]
+after adopting [policy/belief] = po przyjęciu ustroju → [policy/belief]
+before adopting [policy/belief] = jeśli wcześniej nie wybrano ustroju → [policy/belief]
 before founding a Pantheon = przed założeniem Panteonu
 after founding a Pantheon = po założeniu Panteonu
 before founding a religion = przed założeniem religii 
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index d5665dd3fd..07984184fb 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -295,10 +295,13 @@ Strategic resources = Recursos estratégicos
 Owned by you: [amountOwned] = Possuído por ti: [amountOwned]
 Non-existent city = Cidade inexistente
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] não requirido
-Lost ability = Habilidade perdida
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Habilidade nacional
 [firstValue] vs [secondValue] = [firstValue] vs [secondValue]
  # Requires translation!
@@ -534,7 +537,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -840,6 +843,12 @@ Currently playing: [title] = A tocar agora: [title]
 Download music = Transferir música
 Downloading... = Transferência em andamento...
 Could not download music! = Não foi possível transferir!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Avançado
@@ -1475,6 +1484,8 @@ Allied with [civName] = Aliado com [civName]
 Civilization Info = Informação da Civilização
 Relations = Relações
 Trade request = Pedido de troca
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2416,8 +2427,8 @@ if no other Civilization has researched this =
 after discovering [tech] = depois de descobrir [tech]
 before discovering [tech] = antes de descobrir [tech]
  # Requires translation!
-after adopting [policy] = 
-before adopting [policy] = antes de adotar [policy]
+after adopting [policy/belief] = 
+before adopting [policy/belief] = antes de adotar [policy/belief]
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index f3828ae8e9..1ec8cb8ef8 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -299,10 +299,13 @@ Owned by you: [amountOwned] = Deținut de tine: [amountOwned]
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = Nu este nevoie de [resourceName]
-Lost ability = Abilitate pierdută
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Abilitate națională
 [firstValue] vs [secondValue] = [firstValue] vs. [secondValue]
  # Requires translation!
@@ -560,7 +563,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -878,6 +881,12 @@ Currently playing: [title] = Acum se redă: [title]
 Download music = Descarcă muzică
 Downloading... = Se descarcă...
 Could not download music! = Nu s-a putut descărca muzica!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Avansat
@@ -1566,6 +1575,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2553,8 +2564,8 @@ if no other Civilization has researched this =
 after discovering [tech] = după ce am descoperit [tech]
 before discovering [tech] = înainte de a descoperi [tech]
  # Requires translation!
-after adopting [policy] = 
-before adopting [policy] = înainte de a adopta [policy]
+after adopting [policy/belief] = 
+before adopting [policy/belief] = înainte de a adopta [policy/belief]
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index a7931b58bf..d45b712e2e 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -295,10 +295,13 @@ Strategic resources = Стратегические ресурсы
 Owned by you: [amountOwned] = В наличии: [amountOwned]
 Non-existent city = Несуществующий город
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = Не требуется: [resourceName]
-Lost ability = Нет способности
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Национальная особенность
 [firstValue] vs [secondValue] = [firstValue] вместо [secondValue]
  # Requires translation!
@@ -529,7 +532,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -801,6 +804,12 @@ Currently playing: [title] = Сейчас проигрывается: [title]
 Download music = Скачать музыку
 Downloading... = Скачивание...
 Could not download music! = Не удалось скачать музыку!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Дополнительно
@@ -1405,6 +1414,8 @@ Allied with [civName] = Союзники с [civName]
 Civilization Info = Информация о цивилизации
 Relations = Отношения
 Trade request = Торговое предложение
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2168,8 +2179,8 @@ if starting in the [era] =
 if no other Civilization has researched this = если никакая другая цивилизация не исследовала
 after discovering [tech] = после исследования: [tech]
 before discovering [tech] = до исследования: [tech]
-after adopting [policy] = после принятия: [policy]
-before adopting [policy] = до принятия: [policy]
+after adopting [policy/belief] = после принятия: [policy/belief]
+before adopting [policy/belief] = до принятия: [policy/belief]
 before founding a Pantheon = до основания пантеона
 after founding a Pantheon = после основания пантеона
 before founding a religion = до основания религии
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index ba799a3174..04fb853e26 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -293,10 +293,13 @@ Strategic resources = 战略资源
 Owned by you: [amountOwned] = 您所拥有：[amountOwned]
 Non-existent city = 不存在的城市
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = 无需战略资源：[resourceName]
-Lost ability = 失去能力
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = 民族特性
 [firstValue] vs [secondValue] = [firstValue]对[secondValue]
  # Requires translation!
@@ -526,7 +529,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -795,6 +798,12 @@ Currently playing: [title] = 当前播放: [title]
 Download music = 下载音乐
 Downloading... = 正在下载...
 Could not download music! = 无法下载音乐！
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = 高级
@@ -1393,6 +1402,8 @@ Allied with [civName] = 与 [civName] 文明达成联盟
 Civilization Info = 文明信息
 Relations = 关系
 Trade request = 贸易请求
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2143,8 +2154,8 @@ if starting in the [era] = 如果以[era]开始
 if no other Civilization has researched this = 其他文明尚未研究这个科技时
 after discovering [tech] = 当发现[tech]后
 before discovering [tech] = 在发现[tech]前
-after adopting [policy] = 在推行[policy]后
-before adopting [policy] = 在推行[policy]前
+after adopting [policy/belief] = 在推行[policy/belief]后
+before adopting [policy/belief] = 在推行[policy/belief]前
 before founding a Pantheon = 在建立万神殿之后
 after founding a Pantheon = 在建立万神殿之前
 before founding a religion = 在创立宗教之前
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index 7ebbb38634..549c8f392b 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -293,15 +293,16 @@ Strategic resources = Recursos estratégicos
 Owned by you: [amountOwned] = De tu pertenencia: [amountOwned]
 Non-existent city = Ciudad Inexistente
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = no se requiere [resourceName]
-Lost ability = Habilidad perdida
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Habilidad nacional
 [firstValue] vs [secondValue] = [firstValue] vs. [secondValue]
- # Requires translation!
 Gained = Ganado
- # Requires translation!
 Lost = Perdido
 
 
@@ -516,21 +517,14 @@ River generation failed! = ¡Generación de ríos fallida!
 Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = Por favor nó uses el paso "Continente" con el tipo de mapa "Vacío", crea un nuevo mapa en vez.
 This map has errors: = Este mapa tiene errores:
 The incompatible elements have been removed. = Los elementos incompatibles han sido removidos.
- # Requires translation!
 Current map: World Wrap = Mapa actual: Mapa Envolvente
- # Requires translation!
 Overlay image = Imagen superpuesta
- # Requires translation!
 Click to choose a file = Toca para seleccionar un archivo
- # Requires translation!
 Choose an image = Escoge una imagen
  # Requires translation!
-Overlay transparency: = Transparencia de la imagen:
- # Requires translation!
+Overlay opacity: = 
 Invalid overlay image = Imagen inválida para superponer
- # Requires translation!
 World wrap is incompatible with an overlay and was deactivated. = El Mapa Envolvente es incompatible con una imagen superpuesta, y ha sido DESACTIVADO
- # Requires translation!
 An overlay image is incompatible with world wrap and was deactivated. = Una imagen superpuesta es incompatible con Mapa Envolvente y ha sido DESACTIVADA
 
 ## Map/Tool names
@@ -794,7 +788,12 @@ Currently playing: [title] = Reproduciendo actualmente: [title]
 Download music = Descargar música
 Downloading... = Descargando...
 Could not download music! = ¡No se pudo descargar la música!
-Update Mod categories = Actualizar las categorias de Mods
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Avanzado
@@ -1232,9 +1231,7 @@ Please select a tile for this building's [improvement] = Por favor, selecciona u
 Invalid input! Please enter a different string. = ¡Entrada inválida! Por favor pon algo diferente.
 Invalid input! Please enter a valid number. = ¡Entrada inválida! Por favor, digite un número válido.
 Please enter some text = Por favor, introduzca algún texto
- # Requires translation!
 Please enter a file name = Por favor introduzca un nombre de archivo
- # Requires translation!
 File name: = Nombre del archivo:
 
 # Technology UI
@@ -1393,6 +1390,8 @@ Allied with [civName] = Aliado con [civName]
 Civilization Info = Info. de la Civilización
 Relations = Relaciones
 Trade request = Propuesta de Comercio
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -1732,7 +1731,6 @@ Maps = Mapas
 Fun = Juerga
 Mods of mods = Mod de Mod
 Mod info and options = Información de mods y opciones
-Sorting and filtering needs to wait until the online query finishes = Hay que esperar a que la busqueda en linea termine para ordenar y filtrar
 Next page = Siguiente página
 Open Github page = Abrir página de Github
 Permanent audiovisual mod = Mod audiovisual permanente
@@ -2144,8 +2142,8 @@ if starting in the [era] = si se empieza en la [era]
 if no other Civilization has researched this = si nadie más la ha investigado 
 after discovering [tech] = después de descubrir [tech]
 before discovering [tech] = antes de descubrir [tech]
-after adopting [policy] = después de adoptar [policy]
-before adopting [policy] = antes de adoptar [policy]
+after adopting [policy/belief] = después de adoptar [policy/belief]
+before adopting [policy/belief] = antes de adoptar [policy/belief]
 before founding a Pantheon = antes de fundar un Panteón
 after founding a Pantheon = después de fundar un Panteón
 before founding a religion = antes de Fundar una Religión
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index 33840d580e..d993660278 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -300,10 +300,13 @@ Owned by you: [amountOwned] = Ägs av dig: [amountOwned]
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] behövs inte
-Lost ability = Förlorad förmåga
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Nationell förmåga
 [firstValue] vs [secondValue] = [firstValue] jämfört med [secondValue]
  # Requires translation!
@@ -549,7 +552,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -855,6 +858,12 @@ Currently playing: [title] = Spelas nu: [title]
 Download music = Ladda ned musik
 Downloading... = Laddar ned...
 Could not download music! = Kunde inte ladda ned musik!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Avancerat
@@ -1524,6 +1533,8 @@ Civilization Info =
  # Requires translation!
 Relations = 
 Trade request = Handelserbjudande
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2341,8 +2352,8 @@ if starting in the [era] =
 if no other Civilization has researched this = om ingen annan Civilisation har upptäckt detta
 after discovering [tech] = efter upptäckten av [tech]
 before discovering [tech] = innan upptäckten av [tech]
-after adopting [policy] = efter att [policy] anammats
-before adopting [policy] = innan [policy] anammats
+after adopting [policy/belief] = efter att [policy/belief] anammats
+before adopting [policy/belief] = innan [policy/belief] anammats
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index 45257a9dfc..89f91df2af 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -295,10 +295,13 @@ Strategic resources = 戰略資源
 Owned by you: [amountOwned] = 你擁有[amountOwned]
 Non-existent city = 城市不存在
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = 無須戰略資源：[resourceName]
-Lost ability = 失去能力
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = 民族特性
 [firstValue] vs [secondValue] = [firstValue] vs [secondValue]
  # Requires translation!
@@ -533,7 +536,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -834,6 +837,12 @@ Currently playing: [title] = 目前播放：[title]
 Download music = 下載音樂
 Downloading... = 下載中...
 Could not download music! = 無法下載音樂！
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = 更多
@@ -1450,6 +1459,8 @@ Allied with [civName] = 與[civName]聯盟
 Civilization Info = 文明資訊
 Relations = 關係
 Trade request = 貿易請求
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2233,8 +2244,8 @@ if starting in the [era] = 如果開始於[era]
 if no other Civilization has researched this = 如果沒有其他文明研究這個科技的時候
 after discovering [tech] = 發現[tech]後
 before discovering [tech] = 在發現[tech]之前
-after adopting [policy] = 在採用[policy]之後
-before adopting [policy] = 在採用[policy]之前
+after adopting [policy/belief] = 在採用[policy/belief]之後
+before adopting [policy/belief] = 在採用[policy/belief]之前
 before founding a Pantheon = 在建立萬神殿之前
 after founding a Pantheon = 在建立萬神殿之後
  # Requires translation!
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index 0d4b703daa..86efb33431 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -325,10 +325,13 @@ Owned by you: [amountOwned] = Sizdeki miktarı: [amountOwned]
  # Requires translation!
 Non-existent city = 
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] gerekli değil
-Lost ability = Yetenek kaybedildi
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Ulusal yetenek
 [firstValue] vs [secondValue] = [firstValue] - [secondValue]
  # Requires translation!
@@ -598,7 +601,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -911,6 +914,12 @@ Currently playing: [title] = Şimdi çalan: [title]
 Download music = Müzik indir
 Downloading... = İndiriliyor...
 Could not download music! = Müzik indirilemedi!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Gelişmiş
@@ -1655,6 +1664,8 @@ Civilization Info =
 Relations = 
  # Requires translation!
 Trade request = 
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2701,8 +2712,8 @@ if no other Civilization has researched this =
 after discovering [tech] = [tech] keşfedildikten sonra
 before discovering [tech] = [tech] keşfedilmeden önce
  # Requires translation!
-after adopting [policy] = 
-before adopting [policy] = [policy] siyasetini benimsemeden önce
+after adopting [policy/belief] = 
+before adopting [policy/belief] = [policy/belief] siyasetini benimsemeden önce
  # Requires translation!
 before founding a Pantheon = 
  # Requires translation!
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index 761d064d9a..5be199181e 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -293,10 +293,13 @@ Strategic resources = Стратегічні ресурси
 Owned by you: [amountOwned] = Належить вам: [amountOwned]
 Non-existent city = Неіснуюче місто
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = Ресурс [resourceName] не потрібен
-Lost ability = Втрачена здібність
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Національна здібність
 [firstValue] vs [secondValue] = [firstValue] замість [secondValue]
  # Requires translation!
@@ -526,7 +529,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -798,6 +801,12 @@ Currently playing: [title] = Зараз грає: [title]
 Download music = Завантажити музику
 Downloading... = Завантаження...
 Could not download music! = Не вдалося завантажити музику!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Розширені
@@ -1396,6 +1405,8 @@ Allied with [civName] = Союзники з [civName]
 Civilization Info = Інф. про цивілізацію
 Relations = Відносини
 Trade request = Торгова пропозиція
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2149,8 +2160,8 @@ if starting in the [era] = якщо розпочати гру в [era]
 if no other Civilization has researched this = якщо жодна інша Цивілізація не дослідила це
 after discovering [tech] = після дослідження технології [tech]
 before discovering [tech] = перед дослідженням технології [tech]
-after adopting [policy] = після прийняття [policy]
-before adopting [policy] = до прийняття [policy]
+after adopting [policy/belief] = після прийняття [policy/belief]
+before adopting [policy/belief] = до прийняття [policy/belief]
 before founding a Pantheon = перед заснуванням Пантеону
 after founding a Pantheon = після заснування Пантеону
 before founding a religion = перед заснуванням Релігії
diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties
index be8b24cd8b..8fc37ae96b 100644
--- a/android/assets/jsons/translations/Vietnamese.properties
+++ b/android/assets/jsons/translations/Vietnamese.properties
@@ -296,10 +296,13 @@ Strategic resources = Tài nguyên chiến lược
 Owned by you: [amountOwned] = Sở hữu của bạn: [amountOwned]
 Non-existent city = Thành phố không tồn tại 
 
-# Nation picker
+# Unit differences
 
 [resourceName] not required = [resourceName] không yêu cầu
-Lost ability = Mất năng lực
+ # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = 
+ # Requires translation!
+Upgrade all [count] [unit] ([cost] gold) = 
 National ability = Năng lực quốc gia
 [firstValue] vs [secondValue] = [firstValue] với [secondValue]
  # Requires translation!
@@ -554,7 +557,7 @@ Click to choose a file =
  # Requires translation!
 Choose an image = 
  # Requires translation!
-Overlay transparency: = 
+Overlay opacity: = 
  # Requires translation!
 Invalid overlay image = 
  # Requires translation!
@@ -867,6 +870,12 @@ Currently playing: [title] = Hiện đang phát: [title]
 Download music = Tải nhạc
 Downloading... = Đang tải...
 Could not download music! = Không thể tải nhạc!
+ # Requires translation!
+—Paused— = 
+ # Requires translation!
+—Default— = 
+ # Requires translation!
+—History— = 
 
 ## Advanced tab
 Advanced = Nâng cao
@@ -1505,6 +1514,8 @@ Allied with [civName] = Liên minh với [civName]
 Civilization Info = Thông tin về Văn minh
 Relations = Mối quan hệ
 Trade request = Yêu cầu giao dịch
+ # Requires translation!
+Garrisoned by unit = 
 
 # Victory
 
@@ -2306,8 +2317,8 @@ if starting in the [era] =
 if no other Civilization has researched this = nếu không có nền Văn minh nào khác nghiên cứu điều này
 after discovering [tech] = sau khi khám phá [tech]
 before discovering [tech] = trước khi khám phá [tech]
-after adopting [policy] = sau khi áp dụng [policy]
-before adopting [policy] = trước khi áp dụng [policy]
+after adopting [policy/belief] = sau khi áp dụng [policy/belief]
+before adopting [policy/belief] = trước khi áp dụng [policy/belief]
 before founding a Pantheon = trước khi thành lập một điện Pantheon
 after founding a Pantheon = sau khi thành lập điện Pantheon
  # Requires translation!
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index 4a4c0bdb66..e6bf3a94d8 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -1,13 +1,13 @@
 Persian_(Pinglish-UN) = 15
 Italian = 99
-Russian = 99
+Russian = 98
 Belarusian = 2
 Afrikaans = 7
 German = 99
 Swedish = 87
 Turkish = 69
 Ukrainian = 99
-Filipino = 96
+Filipino = 95
 French = 99
 Portuguese = 64
 Indonesian = 99
@@ -24,9 +24,9 @@ Simplified_Chinese = 99
 Bulgarian = 43
 Korean = 96
 Persian_(Pinglish-DIN) = 13
-Japanese = 81
+Japanese = 82
 English = 0
-Vietnamese = 95
+Vietnamese = 94
 Czech = 84
 Hungarian = 78
 Dutch = 68
diff --git a/changelog.md b/changelog.md
index ac0578f4c1..171c859cbe 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,34 +1,22 @@
 ## 4.6.19
 
-chore: Android Gradle Plugin upgrade (7.3.1 -> 7.4.2) 
-
-Resolved  - Transform uniques accept conditionals correctly
-
-bugfix: AI evaluation of ButItemsDiscount no longer crashes
-
-Resolves  - double movement unique accepts conditionals 
-
-"before adopting / after adopting" uniques accept belief as well as policy - 
+Modding:
+- "before adopting / after adopting" conditionals accept beliefs
+- 'Transform' and 'double movement' uniques accept conditionals
+- AI evaluation of BuyItemsDiscount no longer crashes
 
 'random generated map type' is actually random
 
-Resolved  - only display first 5 missing mods
-
-4.6.18-patch1
-
-Revert "Mod checks against sellable, missing or multiple Palace(s) "
-
 By WhoIsJohannes:
-- Show line color in more cases 
-- Only consider attackable enemies within visible tiles. 
-
+- Show line color in more cases
+- AI aircraft only consider *visible* attackable enemies
+-
 By SomeTroglodyte:
-- Fix translated sorting 
-- Refactor input-related components into own package 
-- Only *display* first 5 missing mods but auto-download all 
-- Fix and unit-test Hakkapeliitta TransferMovement ability 
+- Fixed Hakkapeliitta ability
+- Fix translated sorting
+- Fix 'missing mod' display
 
-Pantheon Mod Constants  - By SeventhM
+Pantheon Mod fix - By SeventhM
 
 ## 4.6.18
 
diff --git a/fastlane/metadata/android/en-US/changelogs/877.txt b/fastlane/metadata/android/en-US/changelogs/877.txt
index ddeb1e9dde..5bf35b8fa7 100644
--- a/fastlane/metadata/android/en-US/changelogs/877.txt
+++ b/fastlane/metadata/android/en-US/changelogs/877.txt
@@ -1,31 +1,17 @@
-
-
-chore: Android Gradle Plugin upgrade (7.3.1 -> 7.4.2) 
-
-Resolved  - Transform uniques accept conditionals correctly
-
-bugfix: AI evaluation of ButItemsDiscount no longer crashes
-
-Resolves  - double movement unique accepts conditionals 
-
-"before adopting / after adopting" uniques accept belief as well as policy - 
+Modding:
+- "before adopting / after adopting" conditionals accept beliefs
+- 'Transform' and 'double movement' uniques accept conditionals
+- AI evaluation of BuyItemsDiscount no longer crashes
 
 'random generated map type' is actually random
 
-Resolved  - only display first 5 missing mods
-
-4.6.18-patch1
-
-Revert "Mod checks against sellable, missing or multiple Palace(s) "
-
 By WhoIsJohannes:
-- Show line color in more cases 
-- Only consider attackable enemies within visible tiles. 
-
+- Show line color in more cases
+- AI aircraft only consider *visible* attackable enemies
+-
 By SomeTroglodyte:
-- Fix translated sorting 
-- Refactor input-related components into own package 
-- Only *display* first 5 missing mods but auto-download all 
-- Fix and unit-test Hakkapeliitta TransferMovement ability 
+- Fixed Hakkapeliitta ability
+- Fix translated sorting
+- Fix 'missing mod' display
 
-Pantheon Mod Constants  - By SeventhM
\ No newline at end of file
+Pantheon Mod fix - By SeventhM
\ No newline at end of file