diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties
index d573aa2dec..51ccfa02b7 100644
--- a/android/assets/jsons/translations/Afrikaans.properties
+++ b/android/assets/jsons/translations/Afrikaans.properties
@@ -3591,7 +3591,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -3783,6 +3785,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties
index 084df4ac6a..6f5a9e23df 100644
--- a/android/assets/jsons/translations/Belarusian.properties
+++ b/android/assets/jsons/translations/Belarusian.properties
@@ -3863,7 +3863,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -4055,6 +4057,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Bosnian.properties b/android/assets/jsons/translations/Bosnian.properties
index 6fddf091d4..3161be5c06 100644
--- a/android/assets/jsons/translations/Bosnian.properties
+++ b/android/assets/jsons/translations/Bosnian.properties
@@ -3825,7 +3825,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -4017,6 +4019,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index 6af5ca41e2..0ff21c2fae 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -2157,7 +2157,9 @@ Can be earned through combat = Pode ser obtido através do combate
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] é desenvolvida [relativeAmount]% mais rápido
 Invisible to non-adjacent units = Invisível para unidades não adjacentes
 Can see invisible [mapUnitFilter] units = Pode ver unidades invisíveis [mapUnitFilter]
-May upgrade to [baseUnitFilter] through ruins-like effects = Pode melhorar para [baseUnitFilter] através de efeitos semelhantes a ruínas
+May upgrade to [unit] through ruins-like effects = Pode melhorar para [unit] através de efeitos semelhantes a ruínas
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Destrói melhorias de painel ao atacar
 Cannot move = Não pode se mover
 Double movement in [terrainFilter] = Movimento duplo em [terrainFilter]
@@ -2253,6 +2255,8 @@ after founding a religion = depois de fundar uma religião
 before enhancing a religion = antes de aprimorar uma religião
 after enhancing a religion = depois de aprimorar uma religião
 if [buildingFilter] is constructed = se [buildingFilter] for construído
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = com [resource]
 without [resource] = sem [resource]
 when above [amount] [stat/resource] = quando acima de [amount] de [stat/resource]
diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties
index 066e5a0c65..983d87a0f6 100644
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@@ -2914,7 +2914,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -3103,6 +3105,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties
index 3782ed926e..6ffbc5b3b3 100644
--- a/android/assets/jsons/translations/Catalan.properties
+++ b/android/assets/jsons/translations/Catalan.properties
@@ -2158,7 +2158,9 @@ Can be earned through combat = Es pot obtenir a través del combat
 [greatPerson] is earned [relativeAmount]% faster = Cada «[greatPerson]» s’aconsegueix un [relativeAmount] % més de pressa
 Invisible to non-adjacent units = Invisible per a les unitats que no estiguin adjacents
 Can see invisible [mapUnitFilter] units = Pot veure unitats [mapUnitFilter] invisibles
-May upgrade to [baseUnitFilter] through ruins-like effects = Es pot millorar a [baseUnitFilter] a través d’efectes de les ruïnes
+May upgrade to [unit] through ruins-like effects = Es pot millorar a [unit] a través d’efectes de les ruïnes
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Destrueix les millores de la casella quan ataca
 Cannot move = No es pot moure
 Double movement in [terrainFilter] = Es duplica el moviment en caselles de tipus «[terrainFilter]»
@@ -2254,6 +2256,8 @@ after founding a religion = després de fundar una religió
 before enhancing a religion = abans de millorar una religió
 after enhancing a religion = després de millorar una religió
 if [buildingFilter] is constructed = si s’ha construït «[buildingFilter]»
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = amb [resource]
 without [resource] = sense [resource]
 when above [amount] [stat/resource] = quan s’estigui per damunt de [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index 2842b02df5..cba29a8533 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -2479,7 +2479,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] se získává o [relativeAmount]% rychleji
 Invisible to non-adjacent units = Neviditelný pro nesousední jednotky
 Can see invisible [mapUnitFilter] units = Může vidět neviditelné [mapUnitFilter] jednotky
-May upgrade to [baseUnitFilter] through ruins-like effects = Lze vylepšit na [baseUnitFilter] pomocí efektu ruin a podobných
+May upgrade to [unit] through ruins-like effects = Lze vylepšit na [unit] pomocí efektu ruin a podobných
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -2616,6 +2618,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index 04b6133779..98f5afc56f 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -2159,7 +2159,9 @@ Can be earned through combat = Kan verdiend worden door te vechten
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] wordt [relativeAmount]% sneller verkregen
 Invisible to non-adjacent units = Onzichtbaar voor niet-aangrenzende eenheden
 Can see invisible [mapUnitFilter] units = Kan onzichtbare [mapUnitFilter] eenheden zien
-May upgrade to [baseUnitFilter] through ruins-like effects = Kan opwaarderen naar [baseUnitFilter] door ruine-achtige effecten
+May upgrade to [unit] through ruins-like effects = Kan opwaarderen naar [unit] door ruine-achtige effecten
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Vernietigd verbeteringen tijdens een aanval
 Cannot move = Kan niet bewegen
 Double movement in [terrainFilter] = Dubbele beweging in [terrainFilter]
@@ -2255,6 +2257,8 @@ after founding a religion = na het stichten van een religie
 before enhancing a religion = voor het verbeteren van een religie
 after enhancing a religion = na het verbeteren van een religie
 if [buildingFilter] is constructed = als [buildingFilter] is gebouwd
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = met [resource]
 without [resource] = zonder [resource]
 when above [amount] [stat/resource] = boven [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index 9d4709b6e0..9edcfd64fd 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -4021,7 +4021,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -4213,6 +4215,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties
index a2c58a916d..ad580ac192 100644
--- a/android/assets/jsons/translations/Filipino.properties
+++ b/android/assets/jsons/translations/Filipino.properties
@@ -2328,7 +2328,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] ay makukuha mo ng [relativeAmount]% na mas mabilis 
 Invisible to non-adjacent units = Hindi nakikita ng mga katabi na yunit
 Can see invisible [mapUnitFilter] units = Maaaring makakita ng [mapUnitFilter] units
-May upgrade to [baseUnitFilter] through ruins-like effects = Maaaring itaas sa [baseUnitFilter] sa pamamagitan ng mga epekto na tulad sa guho
+May upgrade to [unit] through ruins-like effects = Maaaring itaas sa [unit] sa pamamagitan ng mga epekto na tulad sa guho
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Winawasak ang mga pagbubuti sa tile kapag umaatake 
 Cannot move = Hindi maaaring kumilos
 Double movement in [terrainFilter] = Dobleng paggalaw sa [terrainFilter]
@@ -2432,6 +2434,8 @@ after founding a religion = pagkatapos magtatag ng isang relihiyon
 before enhancing a religion = bago magpabuti ng isang relihiyon
 after enhancing a religion = pagkatapos magpabuti ng isang relihiyon
 if [buildingFilter] is constructed = kung itinayo ang [buildingFilter] 
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = kasama ang [resource]
 without [resource] = kapag wala ang [resource]
 when above [amount] [stat/resource] = kapag nasa itaas ng [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index 861bfea5d2..9dbd23b6bb 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -3048,7 +3048,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -3235,6 +3237,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 70ce9bac27..c4556c6897 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -783,7 +783,6 @@ Automated workers replace improvements = Les ouvriers automatisés remplacent le
 Automated units move on turn start = Les unités automatisées se déplacent au début du tour
 Automated units can upgrade = Les unités automatisées peuvent s'améliorer elles-mêmes
 Automated units choose promotions = Les unités automatisées choisissent leurs promotions
- # Requires translation!
 Cities auto-bombard at end of turn = Les villes bombardent automatiquement à la fin du tour
 Order trade offers by amount = Classer les offres d'échange par valeur
 Ask for confirmation when pressing next turn = Demander confirmation pour passer au tour suivant
@@ -2158,7 +2157,9 @@ Can be earned through combat = Peut être obtenu en combattant
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] est obtenu [relativeAmount]% plus vite
 Invisible to non-adjacent units = Invisible pour les unités non-adjacentes
 Can see invisible [mapUnitFilter] units = Peut voir les unités [mapUnitFilter] invisibles
-May upgrade to [baseUnitFilter] through ruins-like effects = Peut s'améliorer en [baseUnitFilter] via les bonus de ruines
+May upgrade to [unit] through ruins-like effects = Peut s'améliorer en [unit] via les bonus de ruines
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Détruit les aménagements de case en attaquant
 Cannot move = Ne peut pas se déplacer
 Double movement in [terrainFilter] = Mouvement doublé sur [terrainFilter]
@@ -2254,6 +2255,8 @@ after founding a religion = après avoir fondé une religion
 before enhancing a religion = avant de renforcer une religion
 after enhancing a religion = après avoir renforcé une religion
 if [buildingFilter] is constructed = si [buildingFilter] est construit(e)
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = avec [resource]
 without [resource] = sans [resource]
 when above [amount] [stat/resource] = quand à plus de [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index ac6f053601..4b458d703f 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -2185,7 +2185,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] wird [relativeAmount]% schneller verdient
 Invisible to non-adjacent units = Unsichtbar für nicht benachbarte Einheiten
 Can see invisible [mapUnitFilter] units = Kann unsichtbare [mapUnitFilter] Einheiten sehen
-May upgrade to [baseUnitFilter] through ruins-like effects = Kann durch Ruineneffekte zu [baseUnitFilter] aufrüsten
+May upgrade to [unit] through ruins-like effects = Kann durch Ruineneffekte zu [unit] aufrüsten
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Zerstört die Feldverbesserung bei einem Angriff
 Cannot move = Kann nicht bewegt werden
 Double movement in [terrainFilter] = Doppelte Bewegung auf [terrainFilter]
@@ -2282,6 +2284,8 @@ after founding a religion = nach der Gründung einer Religion
 before enhancing a religion = vor der Verbesserung einer Religion
 after enhancing a religion = nach der Verbesserung einer Religion
 if [buildingFilter] is constructed = wenn [buildingFilter] gebaut wurde
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = mit [resource]
 without [resource] = ohne [resource]
 when above [amount] [stat/resource] = bei mehr als [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties
index b1314fcae9..0181cfdea0 100644
--- a/android/assets/jsons/translations/Greek.properties
+++ b/android/assets/jsons/translations/Greek.properties
@@ -3636,7 +3636,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -3827,6 +3829,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index b48e3cf67e..28bd00eab6 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -2163,7 +2163,9 @@ Can be earned through combat = Harc során szerezhető
 [greatPerson] is earned [relativeAmount]% faster = [relativeAmount]%-kal gyorsabban kapsz [greatPerson] egységeket
 Invisible to non-adjacent units = Nem látják a nem szomszédos egységek
 Can see invisible [mapUnitFilter] units = Észreveszi a láthatatlan [mapUnitFilter] egységeket
-May upgrade to [baseUnitFilter] through ruins-like effects = [baseUnitFilter] egységgé korszerűsíthető a tudással, amely például az ősi romok között található
+May upgrade to [unit] through ruins-like effects = [unit] egységgé korszerűsíthető a tudással, amely például az ősi romok között található
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Elpusztítja a területfejlesztéseket támadáskor
 Cannot move = Nem tud mozogni
 Double movement in [terrainFilter] = Kétszer annyi lépés [terrainFilter] felszínen
@@ -2259,6 +2261,8 @@ after founding a religion = a vallás megalapítása után
 before enhancing a religion = a vallás kibővítése előtt
 after enhancing a religion = a vallás kibővítése után
 if [buildingFilter] is constructed = ha [buildingFilter] kész
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = [resource] segítségével
 without [resource] = [resource] nélkül
 when above [amount] [stat/resource] = [amount] egységnél több [stat/resource] esetén
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 89cfb1bdf5..99702375a4 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -2158,7 +2158,9 @@ Can be earned through combat = Bisa didapatkan melalui pertarungan
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] didapatkan [relativeAmount]% lebih cepat
 Invisible to non-adjacent units = Tidak dapat dilihat oleh unit yang tidak bersebelahan
 Can see invisible [mapUnitFilter] units = Dapat melihat unit [mapUnitFilter] yang tidak kasat mata
-May upgrade to [baseUnitFilter] through ruins-like effects = Dapat meningkat menjadi [baseUnitFilter] melalui pengaruh reruntuhan kuno 
+May upgrade to [unit] through ruins-like effects = Dapat meningkat menjadi [unit] melalui pengaruh reruntuhan kuno 
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Menghancurkan peningkatan daerah saat menyerang
 Cannot move = Tidak bisa bergerak
 Double movement in [terrainFilter] = Pergerakan dua kali lebih cepat di [terrainFilter]
@@ -2254,6 +2256,8 @@ after founding a religion = setelah mendirikan agama
 before enhancing a religion = sebelum menguatkan agama
 after enhancing a religion = setelah menguatkan agama
 if [buildingFilter] is constructed = jika [buildingFilter] telah dibangun
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = dengan [resource]
 without [resource] = tanpa [resource]
 when above [amount] [stat/resource] = saat di atas [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index 2d72cd02cc..5e959707aa 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -2157,7 +2157,9 @@ Can be earned through combat = Ottenibile tramite il combattimento
 [greatPerson] is earned [relativeAmount]% faster = Recluti [greatPerson] il [relativeAmount]% più in fretta
 Invisible to non-adjacent units = Invisibile alle unità non adiacenti
 Can see invisible [mapUnitFilter] units = Può scoprire le unità [mapUnitFilter] invisibili
-May upgrade to [baseUnitFilter] through ruins-like effects = Può aggiornarsi a [baseUnitFilter] tramite gli effetti delle rovine
+May upgrade to [unit] through ruins-like effects = Può aggiornarsi a [unit] tramite gli effetti delle rovine
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Distrugge i miglioramenti quando attacca.
 Cannot move = Non può muoversi
 Double movement in [terrainFilter] = Movimento raddoppiato su [terrainFilter]
@@ -2253,6 +2255,8 @@ after founding a religion = dopo aver fondato una religione
 before enhancing a religion = prima di potenziare una religione
 after enhancing a religion = dopo aver potenziato una religione
 if [buildingFilter] is constructed = se [buildingFilter] è presente
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = con [resource]
 without [resource] = senza [resource]
 when above [amount] [stat/resource] = oltre [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index 2064036748..3cac22e4cc 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -2260,7 +2260,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson]を[relativeAmount]%早く獲得
 Invisible to non-adjacent units = 隣接していないユニットから見えない
 Can see invisible [mapUnitFilter] units = [mapUnitFilter]ユニットを視認できる
-May upgrade to [baseUnitFilter] through ruins-like effects = 遺跡での[baseUnitFilter]へのアップグレードが発生しない
+May upgrade to [unit] through ruins-like effects = 遺跡での[unit]へのアップグレードが発生しない
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = 攻撃時にマップ整備を破壊
 Cannot move = 移動不可
 Double movement in [terrainFilter] = ２倍[terrainFilter]に移動できます
@@ -2370,6 +2372,8 @@ after founding a religion = 宗教創設後
 before enhancing a religion = 宗教強化前
 after enhancing a religion = 宗教強化後
 if [buildingFilter] is constructed = [buildingFilter]が建設されていれば
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = [resource]で
 without [resource] = [resource]無しで
 when above [amount] [stat/resource] = [stat/resource][amount]より多く
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index bef1bd4e89..74704a9884 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -2169,7 +2169,9 @@ Can be earned through combat = 전투로 획득 가능
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] 출현 속도 +[relativeAmount]%
 Invisible to non-adjacent units = 인접한 유닛이 없으면 보이지 않음
 Can see invisible [mapUnitFilter] units = [mapUnitFilter] 유닛 탐지 가능
-May upgrade to [baseUnitFilter] through ruins-like effects = 고대 유적 등을 통해서 [baseUnitFilter](으)로 업그레이드 가능
+May upgrade to [unit] through ruins-like effects = 고대 유적 등을 통해서 [unit](으)로 업그레이드 가능
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = 공격시 시설 파괴
 Cannot move = 이동 불가
 Double movement in [terrainFilter] = [terrainFilter]에서 행동력 소모 절반
@@ -2265,6 +2267,8 @@ after founding a religion = 종교 창시 후
 before enhancing a religion = 종교 강화 전
 after enhancing a religion = 종교 강화 후
 if [buildingFilter] is constructed = [buildingFilter]이 건설되었을때만
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = [resource]이(가) 있는
 without [resource] = [resource]이(가) 없는
 when above [amount] [stat/resource] = [stat/resource] [amount] 초과 시
diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties
index fcda3c961b..3e64152a7c 100644
--- a/android/assets/jsons/translations/Latin.properties
+++ b/android/assets/jsons/translations/Latin.properties
@@ -3769,7 +3769,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -3960,6 +3962,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index afedd2becb..d21542154e 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -2439,7 +2439,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] įgyjamas [relativeAmount]% greičiau
 Invisible to non-adjacent units = Nematoma(s) daliniams nesamtiems šalia
 Can see invisible [mapUnitFilter] units = Gali aptikti nematomus dalinius: [mapUnitFilter]
-May upgrade to [baseUnitFilter] through ruins-like effects = Įėjęs į griuvėsius gali būti pakeistas į: [baseUnitFilter] 
+May upgrade to [unit] through ruins-like effects = Įėjęs į griuvėsius gali būti pakeistas į: [unit] 
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Atakuojant sunaikina laukelio patobulinimus
 Cannot move = Negali judėti
 Double movement in [terrainFilter] = Dvigubas judėjimas per: [terrainFilter]
@@ -2560,6 +2562,8 @@ before enhancing a religion =
  # Requires translation!
 after enhancing a religion = 
 if [buildingFilter] is constructed = jei pastatyta(s): [buildingFilter]
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = su: [resource]
 without [resource] = be: [resource]
  # Requires translation!
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index c86d155b8b..4f46c5ac67 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -2966,7 +2966,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -3154,6 +3156,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index b7f21e165c..c1160c33dc 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -3415,7 +3415,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -3606,6 +3608,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index b614102b63..c13e304c37 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -2986,7 +2986,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -3177,6 +3179,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index e975251069..319758cf29 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -2158,7 +2158,9 @@ Can be earned through combat = Można zdobyć przez bitwę
 [greatPerson] is earned [relativeAmount]% faster = Jednostki [greatPerson] będą generowane [relativeAmount]% szybciej
 Invisible to non-adjacent units = Widoczny tylko dla bezpośrednio sąsiadujących jednostek
 Can see invisible [mapUnitFilter] units = Wykrywa niewidoczne jednostki [mapUnitFilter]
-May upgrade to [baseUnitFilter] through ruins-like effects = Może ulepszyć się do → [baseUnitFilter] dzięki odkryciom w ruinach
+May upgrade to [unit] through ruins-like effects = Może ulepszyć się do → [unit] dzięki odkryciom w ruinach
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Niszczy ulepszenia pól podczas ataku
 Cannot move = Nie może się poruszać
 Double movement in [terrainFilter] = Podwójny ruch przez [terrainFilter]
@@ -2254,6 +2256,8 @@ after founding a religion = po założeniu religii
 before enhancing a religion = przed umocnieniem religii
 after enhancing a religion = po umocnieniu religii
 if [buildingFilter] is constructed = jeśli ukończono [buildingFilter]
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = z [resource]
 without [resource] = bez [resource]
 when above [amount] [stat/resource] = gdy posiadasz ponad [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index 6ef1ce4ffe..cc771d2e9c 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -2500,7 +2500,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -2669,6 +2671,8 @@ after enhancing a religion =
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index d39b20bf68..f2e3647933 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -2391,7 +2391,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
 Cannot move = Nu se poate mișca
@@ -2532,6 +2534,8 @@ before enhancing a religion =
 after enhancing a religion = 
  # Requires translation!
 if [buildingFilter] is constructed = 
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = cu [resource]
 without [resource] = fară [resource]
  # Requires translation!
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index f164bba92d..83ae7020ec 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -2172,7 +2172,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] появляется на [relativeAmount]% быстрее
 Invisible to non-adjacent units = Невидим для юнитов, которые не находятся рядом
 Can see invisible [mapUnitFilter] units = Может обнаруживать невидимые юниты: [mapUnitFilter]
-May upgrade to [baseUnitFilter] through ruins-like effects = Может быть промодернизирован до [baseUnitFilter] через действия руин
+May upgrade to [unit] through ruins-like effects = Может быть промодернизирован до [unit] через действия руин
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Разрушает улучшения клеток при атаке
 Cannot move = Не может передвигаться
 Double movement in [terrainFilter] = Двукратная скорость перемещения через [terrainFilter]
@@ -2269,6 +2271,8 @@ after founding a religion = после основания религии
 before enhancing a religion = до укрепления религии
 after enhancing a religion = после укрепления религии
 if [buildingFilter] is constructed = если имеется: [buildingFilter]
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = с: [resource]
 without [resource] = без: [resource]
 when above [amount] [stat/resource] = когда больше [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/Rusyn.properties b/android/assets/jsons/translations/Rusyn.properties
index 4ee61cb601..0dcf999533 100644
--- a/android/assets/jsons/translations/Rusyn.properties
+++ b/android/assets/jsons/translations/Rusyn.properties
@@ -3372,7 +3372,9 @@ Invisible to non-adjacent units =
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
  # Requires translation!
-May upgrade to [baseUnitFilter] through ruins-like effects = 
+May upgrade to [unit] through ruins-like effects = 
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -3544,6 +3546,8 @@ before enhancing a religion =
 after enhancing a religion = 
  # Requires translation!
 if [buildingFilter] is constructed = 
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = из [resource]
 without [resource] = без [resource]
  # Requires translation!
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 55f1ae3b94..3d58fcae73 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -2158,7 +2158,9 @@ Can be earned through combat = 可通过战斗获得
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson]的产生速率 +[relativeAmount]%
 Invisible to non-adjacent units = 对非相邻单位不可见
 Can see invisible [mapUnitFilter] units = 能发现隐形的[mapUnitFilter]单位
-May upgrade to [baseUnitFilter] through ruins-like effects = 可在废墟中升级为[baseUnitFilter]
+May upgrade to [unit] through ruins-like effects = 可在废墟中升级为[unit]
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = 攻击时摧毁地块设施
 Cannot move = 无法移动
 Double movement in [terrainFilter] = 在[terrainFilter]中拥有双倍移动力
@@ -2254,6 +2256,8 @@ after founding a religion = 在创立宗教之后
 before enhancing a religion = 在加强宗教信仰之前
 after enhancing a religion = 在加强宗教信仰之后
 if [buildingFilter] is constructed = 如果该城市已建造[buildingFilter]
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = 拥有[resource]的
 without [resource] = 未拥有[resource]的
 when above [amount] [stat/resource] = 当[stat/resource]超过[amount]时
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index edf1ed48de..0c55ce6cfb 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -2158,7 +2158,9 @@ Can be earned through combat = Puede obtenerse mediante el combate
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] se gana [relativeAmount]% más rápido
 Invisible to non-adjacent units = Invisible para unidades no-adyacentes
 Can see invisible [mapUnitFilter] units = Puede ver unidades [mapUnitFilter] invisibles
-May upgrade to [baseUnitFilter] through ruins-like effects = Puede mejorarse a [baseUnitFilter] a través de efectos de ruinas
+May upgrade to [unit] through ruins-like effects = Puede mejorarse a [unit] a través de efectos de ruinas
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Destruye mejoras de casilla al atacar
 Cannot move = No se puede mover
 Double movement in [terrainFilter] = Doble movimiento en [terrainFilter]
@@ -2254,6 +2256,8 @@ after founding a religion = después de Fundar una Religión
 before enhancing a religion = antes de Realzar una Religión
 after enhancing a religion = después de Realzar una Religión
 if [buildingFilter] is constructed = si [buildingFilter] está construido
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = con [resource]
 without [resource] = sin [resource]
 when above [amount] [stat/resource] = al tener más de [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties
index c14b047bc6..f00f8e1f9e 100644
--- a/android/assets/jsons/translations/Swedish.properties
+++ b/android/assets/jsons/translations/Swedish.properties
@@ -2447,7 +2447,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] tjänas in [relativeAmount]% snabbare
 Invisible to non-adjacent units = Osynlig för icke-angränsande enheter
 Can see invisible [mapUnitFilter] units = Kan se osynliga [mapUnitFilter] enheter
-May upgrade to [baseUnitFilter] through ruins-like effects = Kan uppgraderas till [baseUnitFilter] genom ruin-liknande effekter
+May upgrade to [unit] through ruins-like effects = Kan uppgraderas till [unit] genom ruin-liknande effekter
+ # Requires translation!
+Can upgrade to [unit] = 
  # Requires translation!
 Destroys tile improvements when attacking = 
  # Requires translation!
@@ -2572,6 +2574,8 @@ before enhancing a religion =
  # Requires translation!
 after enhancing a religion = 
 if [buildingFilter] is constructed = om [buildingFilter] är byggt
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = med [resource]
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index 9df8d68a80..3672e6bb7b 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -2266,7 +2266,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson]的產生速率+[relativeAmount]%
 Invisible to non-adjacent units = 對非相鄰單位不可見
 Can see invisible [mapUnitFilter] units = 能發現不可見的[mapUnitFilter]單位
-May upgrade to [baseUnitFilter] through ruins-like effects = 可通過類似廢墟的效果升級為[baseUnitFilter]
+May upgrade to [unit] through ruins-like effects = 可通過類似廢墟的效果升級為[unit]
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = 攻擊時摧毀地塊設施
 Cannot move = 無法移動
 Double movement in [terrainFilter] = 在[terrainFilter]中擁有雙倍移動力
@@ -2367,6 +2369,8 @@ after founding a religion = 在創立宗教之後
 before enhancing a religion = 在加強宗教信仰之前
 after enhancing a religion = 在加強宗教信仰之後
 if [buildingFilter] is constructed = 如果[buildingFilter]已建造
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = 擁有[resource]
 without [resource] = 未擁有[resource]
 when above [amount] [stat/resource] = 當[stat/resource]高於[amount]時
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index a8ae6d5d56..676befaca8 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -2312,7 +2312,9 @@ Can be earned through combat =
 Invisible to non-adjacent units = 
  # Requires translation!
 Can see invisible [mapUnitFilter] units = 
-May upgrade to [baseUnitFilter] through ruins-like effects = Antik Kalıntılar gibi elemanlar ile [baseUnitFilter] birliğine yükselebilir
+May upgrade to [unit] through ruins-like effects = Antik Kalıntılar gibi elemanlar ile [unit] birliğine yükselebilir
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Saldırırken karo geliştirmelerini yok eder
 Cannot move = Hareket edemez
  # Requires translation!
@@ -2450,6 +2452,8 @@ after enhancing a religion = Dini geliştirdikten sonra
  # Requires translation!
 if [buildingFilter] is constructed = 
  # Requires translation!
+if [buildingFilter] is constructed by anybody = 
+ # Requires translation!
 with [resource] = 
  # Requires translation!
 without [resource] = 
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index 0a833ec4bb..9e4a6c4035 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -2195,7 +2195,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] зʼявляється на [relativeAmount]% швидше
 Invisible to non-adjacent units = Невидима для не-прилеглих підрозділів
 Can see invisible [mapUnitFilter] units = Може бачити невидимі підрозділи типу [mapUnitFilter]
-May upgrade to [baseUnitFilter] through ruins-like effects = Можна удосконалити до [baseUnitFilter] завдяки руїнам, чи подібному ефекту
+May upgrade to [unit] through ruins-like effects = Можна удосконалити до [unit] завдяки руїнам, чи подібному ефекту
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Знищує покращення на клітинках під час атаці
 Cannot move = Не може рухатися
 Double movement in [terrainFilter] = Подвоює ➡Переміщення на клітинках типу [terrainFilter]
@@ -2292,6 +2294,8 @@ after founding a religion = після заснування Релігії
 before enhancing a religion = перед покращенням Релігії
 after enhancing a religion = після покращення Релігії
 if [buildingFilter] is constructed = якщо створено [buildingFilter]
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = з [resource]
 without [resource] = без [resource]
 when above [amount] [stat/resource] = коли більше [amount] [stat/resource]
diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties
index 7962993f93..5535e11683 100644
--- a/android/assets/jsons/translations/Vietnamese.properties
+++ b/android/assets/jsons/translations/Vietnamese.properties
@@ -2438,7 +2438,9 @@ Can be earned through combat =
 [greatPerson] is earned [relativeAmount]% faster = [greatPerson] kiếm được [relativeAmount] nhanh hơn%
 Invisible to non-adjacent units = Ẩn với các đơn vị không liền kề
 Can see invisible [mapUnitFilter] units = Có thể thấy các đơn vị [mapUnitFilter] ẩn
-May upgrade to [baseUnitFilter] through ruins-like effects = Có thể nâng cấp lên [baseUnitFilter] thông qua các hiệu ứng giống như tàn tích
+May upgrade to [unit] through ruins-like effects = Có thể nâng cấp lên [unit] thông qua các hiệu ứng giống như tàn tích
+ # Requires translation!
+Can upgrade to [unit] = 
 Destroys tile improvements when attacking = Phá hủy các cải tiến của ô khi tấn công
 Cannot move = Không thể di chuyển
 Double movement in [terrainFilter] = Di chuyển kép trong [terrainFilter]
@@ -2555,6 +2557,8 @@ before enhancing a religion =
  # Requires translation!
 after enhancing a religion = 
 if [buildingFilter] is constructed = nếu [buildingFilter] được xây dựng
+ # Requires translation!
+if [buildingFilter] is constructed by anybody = 
 with [resource] = với [resource]
 without [resource] = không có [resource]
  # Requires translation!
diff --git a/changelog.md b/changelog.md
index a13cc5a353..604a9cd88e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,14 +1,14 @@
 ## 4.10.2
 
-By SomeTroglodyte:
-- A Conditional checking for a Building globally 
-- Unit actions "paging" new architecture 
-- Fix RequiresBuildingInSomeCities not being displayed in city constructions as rejection reason 
-
 By SeventhM:
-- Fix Spectator stats when viewing another civ 
-- Allow units to upgrade to more than one unit 
-- Fix problems with stats from tiles and improvements 
+- Fix Spectator stats when viewing another civ
+- Allow units to upgrade to more than one unit
+- Fix problems with stats from tiles and improvements
+
+By SomeTroglodyte:
+- A Conditional checking for a Building globally
+- Unit actions "paging" for smaller screens
+- Fix RequiresBuildingInSomeCities not being displayed in city constructions as rejection reason
 
 Improved Spectator selected Civ coloring  - By tuvus
 
diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt
index 3526478f0d..77b097cfa1 100644
--- a/core/src/com/unciv/models/ruleset/Building.kt
+++ b/core/src/com/unciv/models/ruleset/Building.kt
@@ -23,7 +23,6 @@ import com.unciv.ui.objectdescriptions.BuildingDescriptions
 
 class Building : RulesetStatsObject(), INonPerpetualConstruction {
 
-    @Deprecated("The functionality provided by the requiredTech field is provided by the OnlyAvailableWhen unique.")
     override var requiredTech: String? = null
     override var cost: Int = -1
 
diff --git a/core/src/com/unciv/models/ruleset/IConstruction.kt b/core/src/com/unciv/models/ruleset/IConstruction.kt
index 0eec713ba4..b3b3210649 100644
--- a/core/src/com/unciv/models/ruleset/IConstruction.kt
+++ b/core/src/com/unciv/models/ruleset/IConstruction.kt
@@ -31,7 +31,6 @@ interface INonPerpetualConstruction : IConstruction, INamed, IHasUniques {
     val hurryCostModifier: Int
     // Future development should not increase the role of requiredTech, and should reduce it when possible.
     // https://yairm210.github.io/Unciv/Developers/Translations%2C-mods%2C-and-modding-freedom-in-Open-Source#filters
-    @Deprecated("The functionality provided by the requiredTech field is provided by the OnlyAvailableWhen unique.")
     var requiredTech: String?
 
     override fun legacyRequiredTechs(): Sequence<String> = if (requiredTech == null) sequenceOf() else sequenceOf(requiredTech!!)
diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt
index 3316ed919e..cf16905622 100644
--- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt
+++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt
@@ -677,10 +677,13 @@ enum class UniqueType(
 
     /////// tile conditionals
     ConditionalNeighborTiles("with [amount] to [amount] neighboring [tileFilter] tiles", UniqueTarget.Conditional),
+    // TODO: Deprecate, since tilefilter is multifilter
     ConditionalNeighborTilesAnd("with [amount] to [amount] neighboring [tileFilter] [tileFilter] tiles", UniqueTarget.Conditional),
     ConditionalInTiles("in [tileFilter] tiles", UniqueTarget.Conditional),
+    // TODO: Deprecate, since tilefilter is multifilter
     ConditionalInTilesAnd("in [tileFilter] [tileFilter] tiles", UniqueTarget.Conditional),
     ConditionalInTilesNot("in tiles without [tileFilter]", UniqueTarget.Conditional),
+    // TODO: Add adjacency ("in tiles adjacent to [tileFilter]", "in tiles not adjacent to [tileFilter])
     ConditionalNearTiles("within [amount] tiles of a [tileFilter]", UniqueTarget.Conditional),
 
     /////// area conditionals
diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
index a13824f0d3..d6d2ad6f93 100644
--- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
+++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
@@ -40,7 +40,6 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
     var unitType: String = ""
 
     val type by lazy { ruleset.unitTypes[unitType]!! }
-    @Deprecated("The functionality provided by the requiredTech field is provided by the OnlyAvailableWhen unique.")
     override var requiredTech: String? = null
     var requiredResource: String? = null
 
@@ -88,7 +87,7 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
     }
 
     fun getRulesetUpgradeUnits(stateForConditionals: StateForConditionals? = null): Sequence<BaseUnit> {
-        return sequence { 
+        return sequence {
             for (unit in getUpgradeUnits(stateForConditionals))
                 yieldIfNotNull(ruleset.units[unit])
         }
diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md
index 4f9400e3a0..fb68c67581 100644
--- a/docs/Modders/uniques.md
+++ b/docs/Modders/uniques.md
@@ -1385,8 +1385,13 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
 
 	Applicable to: Unit
 
-??? example  "May upgrade to [baseUnitFilter] through ruins-like effects"
-	Example: "May upgrade to [Melee] through ruins-like effects"
+??? example  "May upgrade to [unit] through ruins-like effects"
+	Example: "May upgrade to [Musketman] through ruins-like effects"
+
+	Applicable to: Unit
+
+??? example  "Can upgrade to [unit]"
+	Example: "Can upgrade to [Musketman]"
 
 	Applicable to: Unit
 
diff --git a/fastlane/metadata/android/en-US/changelogs/960.txt b/fastlane/metadata/android/en-US/changelogs/960.txt
index dcba4eeaa8..d7ddf6e62c 100644
--- a/fastlane/metadata/android/en-US/changelogs/960.txt
+++ b/fastlane/metadata/android/en-US/changelogs/960.txt
@@ -1,5 +1,3 @@
-
-
 By SomeTroglodyte:
 - A Conditional checking for a Building globally 
 - Unit actions "paging" new architecture