From c37983667c34c31f2cf9aff0a64a813c128f885d Mon Sep 17 00:00:00 2001
From: lishaoxia1985 <lishaoxia1985160@sina.com>
Date: Fri, 10 May 2019 03:57:15 +0800
Subject: [PATCH] move some words into other translation files,the city name
 can be changed with setting

although the city name can be changed with setting,it's only correct when you build a new city or start a new game.if you change the game language in game progress it will miss some font.
---
 android/assets/jsons/Translations/Other.json  | 262 ++-------------
 .../jsons/Translations/Units,Promotions.json  | 303 ++++++++++++++++--
 core/src/com/unciv/logic/city/CityInfo.kt     |   2 +-
 3 files changed, 314 insertions(+), 253 deletions(-)

diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json
index 9a4259df14..7c5d27b73a 100644
--- a/android/assets/jsons/Translations/Other.json
+++ b/android/assets/jsons/Translations/Other.json
@@ -1453,54 +1453,6 @@
 		Portuguese:"Penalização contra [unitType]"
 	}
 
-	"Can move after attacking":{
-		Italian:"Può muoversi dopo aver attaccato"
-		Russian:"Может двигаться после атаки"
-		French:"Peut se déplacer après avoir attaqué"
-		Romanian:"Poate să se deplaseze după ce a atacat"
-		German:"Kann sich nach dem Angriff bewegen"
-		Dutch:"Kan zich verplaatsen na het aanvallen"
-		Spanish:"Puede mover después de atacar"
-		Simplified_Chinese:"攻击后可移动"
-		Portuguese:"Pode se mover após atacar"
-	}
-
-	"Limited Visibility":{
-		Italian:"Visibilità limitata"
-		Russian:"Ограниченная видимость"
-		French:"Visibilité réduite"
-		Romanian:"Vizibilitate redusă"
-		German:"Begrenzte Sichtweite"
-		Dutch:"Gelimiteerd zicht"
-		Spanish:"Visibilidad limitada"
-		Simplified_Chinese:"视野受限"
-		Portuguese:"Visibilidade limitada"
-	}
-
-	"Bonus as Attacker 75%":{
-		Italian:"75% Bonus in attacco"
-		Simplified_Chinese:"主动攻击时+75%战斗力"
-		French:"Bonus en tant qu'attaquant +75%"
-	}
-
-	"Invisible to others":{
-		Italian:"Invisibile per le altre unità"
-		Simplified_Chinese:"对其他单位隐形"
-		French:"Invisible aux autres" // (unités)
-	}
-
-	"Can only attack water":{
-		Italian:"Può attaccare solo unità acquatiche"
-		Simplified_Chinese:"只能攻击海上目标"
-		French:"Ne peut attaquer que les unités marines"
-	}
-
-	"Can attack submarines":{
-		Italian:"Può attaccare i sottomarini"
-		Simplified_Chinese:"能够发现和攻击潜艇单位"
-		French:"Peut attaquer les sous-marins"
-	}
-
 ///////// Old Great Person translations (for reference only)
 
 	"Can start an 8-turn golden age or construct a Landmark (+6 Culture)":{
@@ -1551,16 +1503,6 @@
 		Simplified_Chinese:"加快奇观的建造速度或建造1座工厂(+4生产)"
 	}
 	
-	"May create improvements on water resources":{
-		Spanish:"Puede crear mejoras en recursos acuaticos"
-		Italian:"Può costruire miglioramenti sulle risorse acquatiche"
-		French:"Peut créer des améliorations de ressources maritimes"
-		Romanian:"Poate crea îmbunătățiri pe resurse acvatice"
-		Simplified_Chinese:"可在水域资源建造设施"
-		Portuguese:"Pode criar melhorias em recursos aquáticos"
-		German:"Kann Verbesserungen auf Wasserfeldern bauen"
-		Russian:"Может создать улучшения на водных ресурсах"
-	}
 	
 	"Create [improvementName]":{ // for unit action button - also used for "create fishing boats" and "create oil well"
 		Italian:"Costruisci [improvementName]"
@@ -1572,17 +1514,6 @@
 		Russian:"Создайте [improvementName]"
 		Portuguese:"Crio [improvementName]"
 	}
-	
-	"Can start an 8-turn golden age":{
-		Romanian:"Poate începe o eră de aur de 8 runde"
-		Spanish:"Comienza una edad dorada por 8 turnos"
-		Italian:"Può avviare un'Età dell'Oro di 8 turni"
-		French:"Peut commencer un âge d'or de 8 tours"
-		Simplified_Chinese:"可以开启8回合黄金时代"
-		Portuguese:"Pode criar uma Idade Dourada de 8 turnos"
-		German:"Kann ein Goldenes Zeitalter über 8 Runden starten" //I chose to transl. as if Golden Age is a proper name
-		Russian:"Может начать золотой век с 8 поворотами"
-	}
 
 	"Start Golden Age":{
 		Italian:"Avvia un'Età dell'Oro"
@@ -1595,34 +1526,7 @@
 		Portuguese:"Comece a Idade de Ouro"
 	}
 
-	"Bonus for land units in 2 radius 15%" :{
-		Italian:"15% Bonus per le unità terrestri nel raggio di 2 caselle"
-		Simplified_Chinese:"周围两格地块内的我方所有陆军单位+15%战斗力"
-        	French:"Bonus de combat +15% pour les unités terrestres dans un rayon de 2 cases"
-	}
-
 	// for unit action button
-	"Can build improvement: Landmark":{
-		Spanish:"Puede construir mejora: Edificio Emblematico"
-		Italian:"Può costruire il miglioramento: Punto di riferimento"
-		French:"Peut construire l'amélioration suivante: Monument culturel"
-		Romanian:"Poate construi îmbunătățire: Reper"
-		Simplified_Chinese:"可以建造设施：风景地标"
-		Russian:"Можно построить улучшение: ориентир"
-		Portuguese:"Pode construir melhoria: ponto de refêrencia"
-		German:"Kann Verbesserung errichten: Sehenswürdigkeit"
-	}
-
-	"Can discover a technology":{
-		Spanish:"Puede descubrir una tecnologia"
-		Italian:"Può scoprire una tecnologia"
-		French:"Peut découvrir une technologie"
-		Romanian:"Poate descoperi o tehnologie"
-		Simplified_Chinese:"可以发现1项科技"
-		Portuguese:"Pode descobrir uma tecnologia"
-		German:"Kann eine Technologie entdecken"
-		Russian:"Может открыть для себя технологию"
-	}
 
 	"Discover Technology":{
 		Romanian:"Descoperă tehnologie"
@@ -1636,27 +1540,6 @@
 	}
 
 	// for unit action button
-	"Can build improvement: Academy":{
-		Spanish:"Puede construir mejora: Academia"
-		Italian:"Può costruire il miglioramento: Accademia"
-		French:"Peut construire l'amélioration suivante: Académie"
-		Romanian:"Poate construi îmbunătățire: Academie"
-		Simplified_Chinese:"可以建造设施：学院"
-		Portuguese:"Pode construir melhoria: Academia"
-		German:"Kann Verbesserung errichten: Akademie"
-		Russian:"Можно построить улучшение: Академия"
-	}
-
-	"Can undertake a trade mission, giving a large sum of gold":{
-		Spanish:"Puede tomar una mision de comercio, generando una gran suma de Oro"
-		Italian:"Può compiere missioni commerciali, donando grandi quantità di Oro"
-		French:"Peut entreprendre une mission commerciale qui donne une large somme en or"
-		Romanian:"Poate iniția o misiune comercială, oferind o sumă considerabilă de aur"
-		Simplified_Chinese:"可以开展贸易获得大笔金钱"
-		Portuguese:"Pode entrar em uma missão comercial, dando grande quantidades de ouro"
-		German:"Kann eine Handelsmission durchführen, die viel Gold einbringt"
-		Russian:"Pode realizar uma missão comercial, dando uma grande soma de ouro"
-	}
 
 	"Conduct Trade Mission":{
 		Italian:"Conduci missione commerciale"
@@ -1681,28 +1564,6 @@
 		Russian:"Ваша торговая миссия принесла вам [goldGained] золота!"
 	}
 
-	"Can build improvement: Customs house":{
-		Spanish:"Puede construir mejora: Aduana"
-		Italian:"Può costruire il miglioramento: Dogana"
-		French:"Peut construire l'amélioration suivante: Douanes"
-		Romanian:"Poate construi îmbunătățire: Punct vamal"
-		Simplified_Chinese:"可以建造设施：海关"
-		Portuguese:"Pode criar melhoria: Alfândega"
-		Russian:"Можно построить улучшение: таможня"
-		German:"Kann Verbesserung errichten: Zollhaus"
-	}
-
-	"Can speed up construction of a wonder":{
-		Spanish:"Puede acelerar la construccion de una maravilla"
-		Italian:"Può accelerare la costruzione di una Meraviglia"
-		French:"Peut accélérer la construction d'une Merveille"
-		Romanian:"Poate accelera construirea unei minuni"
-		Simplified_Chinese:"可以加快一座奇观的建造速度"
-		Portuguese:"Pode acelerar a construção de uma maravilha"
-		German:"Kann die Produktion eines Wunders beschleunigen"
-		Russian:"Может ускорить строительство чудо"
-	}
-
 	"Hurry Wonder":{
 		Italian:"Accellera Meraviglia"
 		Romanian:"Grăbește minune"
@@ -1713,79 +1574,6 @@
 		Russian:"Спешите, чудо"
 		Portuguese:"Apresse-se Maravilha"
 	} 
-
-	"Unbuildable":{
-		Italian:"Non costruibile"
-		Simplified_Chinese:"不可组建单位"
-		French:"Ne peut être construit" // or Inconstruisible but not sure that it's correct 
-	}
-
-	// for unit action button
-	"Can build improvement: Manufactory":{
-		Italian:"Può costruire il miglioramento: Manifattura"
-		French:"Peut construire l'amélioration suivante: Manufacture"
-		Romanian:"Poate construi îmbunătățire: fabrică"
-		Simplified_Chinese:"可以建造设施：制造中心"
-		Portuguese:"Pode construir melhoria: Fábrica"
-		German:"Kann Verbesserung errichten: Manufaktur"
-		Russian:"Можно построить улучшение: мануфактура"
-		Spanish:"Se puede construir mejora: Manufactura"
-	}
-	
-	"Cannot enter ocean tiles":{
-		Spanish:"No puede entrar al oceanó"
-		Italian:"Non può entrare nelle caselle oceaniche"
-		French:"Ne peut pas aller sur les tuiles océan"
-		Romanian:"Nu poate accesa celule ocean"
-		Simplified_Chinese:"不能进入海洋"
-		Portuguese:"Não pode entrar o terreno 'oceano' "
-		German:"Ozeanfelder können nicht befahren werden"
-		Russian:"Не может войти в океанские плитки"
-	}
-
-	"Cannot enter ocean tiles until Astronomy":{
-		Spanish:"No puede entrar al oceanó hasta investigar astronomia"
-		Italian:"Può entrare nell'oceano solo dopo aver scoperto l'Astronomia"
-		French:"Ne peut pas aller sur les tuiles océan avant la découverte de l'Astronomie"
-		Romanian:"Nu poate accesa celule ocean înainte de descoperirea Astronomiei"
-		Simplified_Chinese:"不能进入海洋直到掌握天文学"
-		Portuguese:"Não pode entrar o terreno 'oceano' até a pesquisa Astronomia" // if you want you can take away the 'a pesquisa'
-		German:"Ozeanfelder können nicht befahren werden bis Astronomie erforscht ist"
-		Russian:"Не может войти в океанские плитки до Астрономии"
-	}
-
-	"+1 Visibility Range":{
-		Spanish:"+1 Al Rango de Visibilidad"
-		Italian:"+1 raggio di Visione"
-		French:"+1 à la Portée de Vision"
-		Romanian:"+1 Rază vizuală"
-		Simplified_Chinese:"+1视野"
-		Portuguese:"+1 de alcançe ao campo de visão"
-		German:"+1 Sichtweite"
-		Russian:"+1 Диапазон видимости"
-	}
-
-	"Double movement in coast":{
-		Spanish:"Doble movimiento en costas"
-		Italian:"Doppio movimento sulla costa"
-		French:"Double mouvement le long des côtes"
-		Romanian:"Deplasare dublă pe țărm"
-		Simplified_Chinese:"海滨移动时双倍移动力"
-		Portuguese:"Movimento em dobro nas costas"
-		German:"Doppelte Bewegungsgeschwindigkeit an der Küste"
-		Russian:"Двойное движение на побережье"
-	}
-
-	"Indirect Fire":{ // units can fire over forests/hills
-		Spanish:"Fuego Indirecto (Puede disparar sobre colinas y bosques)"
-		Italian:"Fuoco indiretto (l'unità può sparare oltre le foreste o le colline)"
-		French:"Tir indirect"
-		Romanian:"Tir cu boltă"
-		Simplified_Chinese:"间接射击"
-		Portuguese:"Fogo indireto"
-		German:"Indirekter Beschuss"
-		Russian:"Косвенный огонь"
-	}
 	
 ////// Policy picker screen
 
@@ -2043,7 +1831,7 @@
 		French:"Capacité de la civilisation"
 		Portuguese:"Habilidade nacional"
 		Russian:"Национальная способность"
-		Simplified_Chinese:"国家能力"
+		Simplified_Chinese:"民族特性"
 	}
 	
 	"Babylon":{	
@@ -2745,40 +2533,46 @@
 	
 	// Relationship states, from worst (Unforgivable) to best (Ally)
 	
-    "Unforgivable":{
+  "Unforgivable":{
 		Italian:"Imperdonabile"
 		French:"Impardonnable"
-    }
+		Simplified_Chinese:"仇深似海"
+  }
 
-    "Enemy":{
+  "Enemy":{
 		Italian:"Nemico"
 		French:"Ennemi"
-    }
+		Simplified_Chinese:"宿命之敌"
+  }
 
-    "Competitor":{
-	    Italian:"Avversario"
-	    French:"Adversaire" //or en compétition
-    }
+  "Competitor":{
+	  Italian:"Avversario"
+		French:"Adversaire" //or en compétition
+		Simplified_Chinese:"瑜亮之争"
+  }
 
-    "Neutral":{
-        Italian:"Neutrale"
-	    French:"Neutre"
-    }
+  "Neutral":{
+    Italian:"Neutrale"
+		French:"Neutre"
+		Simplified_Chinese:"泛泛之交"
+  }
 
-    "Favorable":{
+  "Favorable":{
 		Italian:"Favorevole"
-	    French:"Favorable"
-    }
+		French:"Favorable"
+		Simplified_Chinese:"惺惺相惜"
+  }
 
-    "Friend":{
+  "Friend":{
 		Italian:"Amichevole"
-	    French:"Ami"
-    }
+		French:"Ami"
+		Simplified_Chinese:"秦晋之好"
+  }
 
-    "Ally":{
+  "Ally":{
 		Italian:"Alleato"
-	    French:"Allié"
-    }
+	  French:"歃血之盟"
+  }
 	
 ////// Diplomatic modifiers
 
diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json
index d92e15edf3..346a745a72 100644
--- a/android/assets/jsons/Translations/Units,Promotions.json
+++ b/android/assets/jsons/Translations/Units,Promotions.json
@@ -230,6 +230,28 @@
 		German:"Arbeitsboote"
 	}
 
+	"Cannot enter ocean tiles until Astronomy":{
+		Spanish:"No puede entrar al oceanó hasta investigar astronomia"
+		Italian:"Può entrare nell'oceano solo dopo aver scoperto l'Astronomia"
+		French:"Ne peut pas aller sur les tuiles océan avant la découverte de l'Astronomie"
+		Romanian:"Nu poate accesa celule ocean înainte de descoperirea Astronomiei"
+		Simplified_Chinese:"不能进入海洋直到掌握天文学"
+		Portuguese:"Não pode entrar o terreno 'oceano' até a pesquisa Astronomia" // if you want you can take away the 'a pesquisa'
+		German:"Ozeanfelder können nicht befahren werden bis Astronomie erforscht ist"
+		Russian:"Не может войти в океанские плитки до Астрономии"
+	}
+
+	"May create improvements on water resources":{
+		Spanish:"Puede crear mejoras en recursos acuaticos"
+		Italian:"Può costruire miglioramenti sulle risorse acquatiche"
+		French:"Peut créer des améliorations de ressources maritimes"
+		Romanian:"Poate crea îmbunătățiri pe resurse acvatice"
+		Simplified_Chinese:"可在水域资源建造设施"
+		Portuguese:"Pode criar melhorias em recursos aquáticos"
+		German:"Kann Verbesserungen auf Wasserfeldern bauen"
+		Russian:"Может создать улучшения на водных ресурсах"
+	}
+
 	"Trireme":{
 		Spanish:"Trirreme"
 		Italian:"Trireme"
@@ -240,6 +262,17 @@
 		//same in German
 	}
 
+	"Cannot enter ocean tiles":{
+		Spanish:"No puede entrar al oceanó"
+		Italian:"Non può entrare nelle caselle oceaniche"
+		French:"Ne peut pas aller sur les tuiles océan"
+		Romanian:"Nu poate accesa celule ocean"
+		Simplified_Chinese:"不能进入海洋"
+		Portuguese:"Não pode entrar o terreno 'oceano' "
+		German:"Ozeanfelder können nicht befahren werden"
+		Russian:"Не может войти в океанские плитки"
+	}
+
 	"Chariot Archer":{	
 		Italian:"Arciere su carro"
 		Russian:"Лучник на колеснице"
@@ -251,7 +284,6 @@
 		German:"Streitwagen-Bogenschütze"
 	}
 	
-	
 	"No defensive terrain bonus":{
 		Italian:"Nessun bonus difensivo su terreno"
 		Russian:"Нет бонуса защиты от ландшафта"
@@ -297,6 +329,10 @@
 		German:"Speerkrieger"
 	}
 
+	"Bonus vs Mounted 50%":{
+		Simplified_Chinese:"对战骑乘单位时+50%战斗力"
+	}
+
 	"Hoplite":{ // Greek unique
 		Italian:"Oplita"
 		Romanian:"Hoplit"
@@ -328,6 +364,10 @@
 		German:"Katapult"
 	}	
 	
+	"Bonus vs City 200%":{
+		Simplified_Chinese:"攻击城市时+200%战斗力"
+	}
+
 	"Must set up to ranged attack":{
 		Italian:"Deve allestirsi per attaccare a distanza"
 		Russian:"Необходимо подготовится к дальнобойной атаке"
@@ -393,6 +433,22 @@
 		German:"Reiter"
 	}
 
+	"Can move after attacking":{
+		Italian:"Può muoversi dopo aver attaccato"
+		Russian:"Может двигаться после атаки"
+		French:"Peut se déplacer après avoir attaqué"
+		Romanian:"Poate să se deplaseze după ce a atacat"
+		German:"Kann sich nach dem Angriff bewegen"
+		Dutch:"Kan zich verplaatsen na het aanvallen"
+		Spanish:"Puede mover después de atacar"
+		Simplified_Chinese:"攻击后可移动"
+		Portuguese:"Pode se mover após atacar"
+	}
+
+	"Penalty vs City 33%":{
+		Simplified_Chinese:"攻击城市时-33%战斗力"
+	}
+
 	"Companion Cavalry":{	
 		Italian:"Cavalleria dei Compagni"
 		Russian:"Сопутствующая кавалерия"
@@ -465,6 +521,18 @@
 		German:"Tribock"
 	}
 
+	"Limited Visibility":{
+		Italian:"Visibilità limitata"
+		Russian:"Ограниченная видимость"
+		French:"Visibilité réduite"
+		Romanian:"Vizibilitate redusă"
+		German:"Begrenzte Sichtweite"
+		Dutch:"Gelimiteerd zicht"
+		Spanish:"Visibilidad limitada"
+		Simplified_Chinese:"视野受限"
+		Portuguese:"Visibilidade limitada"
+	}
+
 	"Longswordsman":{
 		Italian:"Guerriero con spada lunga"
 		Russian:"Мечник (длинный меч)"
@@ -533,6 +601,17 @@
 		German:"Karavelle"
 	}
 
+	"+1 Visibility Range":{
+		Spanish:"+1 Al Rango de Visibilidad"
+		Italian:"+1 raggio di Visione"
+		French:"+1 à la Portée de Vision"
+		Romanian:"+1 Rază vizuală"
+		Simplified_Chinese:"+1视野"
+		Portuguese:"+1 de alcançe ao campo de visão"
+		German:"+1 Sichtweite"
+		Russian:"+1 Диапазон видимости"
+	}
+
 	"Cannon":{	
 		Italian:"Cannone"
 		Russian:"Пушка"
@@ -608,6 +687,10 @@
 		German:"Lanzer"
 	}
 	
+	"Bonus vs Mounted 33%":{	
+		Simplified_Chinese:"对战骑乘单位时+33%战斗力"
+	}
+
 ////// Industrial units
 	
 	"Gatling Gun":{
@@ -652,6 +735,13 @@
 		French:"Cosaque"
 	}
 	
+	"Bonus vs wounded units 33%":{
+		Italian:"+33% forza contro unità ferite"
+		French:"+33% force contre les unités montées"
+		Russian:"Бонус против раненых 33%"
+		Simplified_Chinese:"对战受伤单位时+33%战斗力"
+	}
+
 	"Artillery":{	
 		Italian:"Artiglieria"
 		Russian:"Артиллерия"
@@ -663,6 +753,14 @@
 		German:"Artillerie"
 	}
 
+	"Indirect Fire":{
+		Italian:"Fuoco indiretto"
+		German:"Indirektes Feuer"
+		French:"Attaque indirecte" //not sure
+		Russian:"Непрямой Огонь"
+		Simplified_Chinese:"间瞄射击"
+	}
+
 	"Ironclad":{
 		Spanish:"Buque a vapor"
 		Italian:"Ironclad"
@@ -674,6 +772,21 @@
 		German:"Panzerschiff"
 	}
 	
+	"Bonus vs City 33%":{
+		Simplified_Chinese:"攻击城市时+33%战斗力"
+	}
+
+	"Double movement in coast":{
+		Spanish:"Doble movimiento en costas"
+		Italian:"Doppio movimento sulla costa"
+		French:"Double mouvement le long des côtes"
+		Romanian:"Deplasare dublă pe țărm"
+		Simplified_Chinese:"海滨移动时双倍移动力"
+		Portuguese:"Movimento em dobro nas costas"
+		German:"Doppelte Bewegungsgeschwindigkeit an der Küste"
+		Russian:"Двойное движение на побережье"
+	}
+
 ////// Modern units
 
 	"Landship":{
@@ -722,7 +835,7 @@
 
 	"Foreign Land":{ // for battle table combat percentage
 		Italian:"Terra Straniera"
-		Simplified_Chinese:"他国领土"
+		Simplified_Chinese:"境外"
 		French:"Terre étrangère"
 	}
 	
@@ -736,6 +849,12 @@
 		French:"Destroyer"
 	}
 
+	"Can attack submarines":{
+		Italian:"Può attaccare i sottomarini"
+		Simplified_Chinese:"能够发现和攻击潜艇单位"
+		French:"Peut attaquer les sous-marins"
+	}
+
 	"Machine Gun":{
 		Italian:"Mitragliatrice"
 		Romanian:"Mitralieră"
@@ -776,6 +895,10 @@
 		French:"cuirassé"
 	}
 
+	"Bonus vs City 30%":{
+		Simplified_Chinese:"攻击城市时+30%战斗力"
+	}
+
 	"Submarine":{
 		Italian:"Sottomarino"
 		Romanian:"Submarin"
@@ -786,6 +909,24 @@
 		French:"Sous-marin"
 	}
 
+	"Bonus as Attacker 75%":{
+		Italian:"75% Bonus in attacco"
+		Simplified_Chinese:"主动攻击时+75%战斗力"
+		French:"Bonus en tant qu'attaquant +75%"
+	}
+
+	"Invisible to others":{
+		Italian:"Invisibile per le altre unità"
+		Simplified_Chinese:"对其他单位隐形"
+		French:"Invisible aux autres" // (unités)
+	}
+
+	"Can only attack water":{
+		Italian:"Può attaccare solo unità acquatiche"
+		Simplified_Chinese:"只能攻击海上目标"
+		French:"Ne peut attaquer que les unités marines"
+	}
+
 	"Carrier":{ // aircrat carrier
 		Italian:"Portaerei"
 		Romanian:"Portavion"
@@ -838,6 +979,10 @@
 		French:"Canon antichar"
 	}
 
+	"Bonus vs Armor 100%":{
+		Simplified_Chinese:"对战装甲单位时+100%战斗力"
+	}
+
 	"Marine":{
 		Italian:"Marine"
 		Romanian:"Pușcaș marin"
@@ -959,6 +1104,35 @@
 		German:"Großer Künstler"
 	}
 
+
+	"Unbuildable":{
+		Italian:"Non costruibile"
+		Simplified_Chinese:"不可组建单位"
+		French:"Ne peut être construit" // or Inconstruisible but not sure that it's correct 
+	}
+
+	"Can start an 8-turn golden age":{
+		Romanian:"Poate începe o eră de aur de 8 runde"
+		Spanish:"Comienza una edad dorada por 8 turnos"
+		Italian:"Può avviare un'Età dell'Oro di 8 turni"
+		French:"Peut commencer un âge d'or de 8 tours"
+		Simplified_Chinese:"可以开启8回合黄金时代"
+		Portuguese:"Pode criar uma Idade Dourada de 8 turnos"
+		German:"Kann ein Goldenes Zeitalter über 8 Runden starten" //I chose to transl. as if Golden Age is a proper name
+		Russian:"Может начать золотой век с 8 поворотами"
+	}
+
+	"Can build improvement: Landmark":{
+		Spanish:"Puede construir mejora: Edificio Emblematico"
+		Italian:"Può costruire il miglioramento: Punto di riferimento"
+		French:"Peut construire l'amélioration suivante: Monument culturel"
+		Romanian:"Poate construi îmbunătățire: Reper"
+		Simplified_Chinese:"可以建造设施：风景地标"
+		Russian:"Можно построить улучшение: ориентир"
+		Portuguese:"Pode construir melhoria: ponto de refêrencia"
+		German:"Kann Verbesserung errichten: Sehenswürdigkeit"
+	}
+
 	"Great Scientist":{	
 		Italian:"Grande Scienziato"
 		Russian:"Великий ученый"
@@ -970,6 +1144,28 @@
 		German:"Großer Wissenschaftler"
 	}
 
+	"Can discover a technology":{
+		Spanish:"Puede descubrir una tecnologia"
+		Italian:"Può scoprire una tecnologia"
+		French:"Peut découvrir une technologie"
+		Romanian:"Poate descoperi o tehnologie"
+		Simplified_Chinese:"可以发现1项科技"
+		Portuguese:"Pode descobrir uma tecnologia"
+		German:"Kann eine Technologie entdecken"
+		Russian:"Может открыть для себя технологию"
+	}
+
+	"Can build improvement: Academy":{
+		Spanish:"Puede construir mejora: Academia"
+		Italian:"Può costruire il miglioramento: Accademia"
+		French:"Peut construire l'amélioration suivante: Académie"
+		Romanian:"Poate construi îmbunătățire: Academie"
+		Simplified_Chinese:"可以建造设施：学院"
+		Portuguese:"Pode construir melhoria: Academia"
+		German:"Kann Verbesserung errichten: Akademie"
+		Russian:"Можно построить улучшение: Академия"
+	}
+
 	"Great Merchant":{	
 		Italian:"Grande Mercante"
 		Russian:"Великий торговец"
@@ -981,6 +1177,28 @@
 		German:"Großer Händler"
 	}
 
+	"Can undertake a trade mission, giving a large sum of gold":{
+		Spanish:"Puede tomar una mision de comercio, generando una gran suma de Oro"
+		Italian:"Può compiere missioni commerciali, donando grandi quantità di Oro"
+		French:"Peut entreprendre une mission commerciale qui donne une large somme en or"
+		Romanian:"Poate iniția o misiune comercială, oferind o sumă considerabilă de aur"
+		Simplified_Chinese:"可以开展贸易获得大笔金钱"
+		Portuguese:"Pode entrar em uma missão comercial, dando grande quantidades de ouro"
+		German:"Kann eine Handelsmission durchführen, die viel Gold einbringt"
+		Russian:"Pode realizar uma missão comercial, dando uma grande soma de ouro"
+	}
+
+	"Can build improvement: Customs house":{
+		Spanish:"Puede construir mejora: Aduana"
+		Italian:"Può costruire il miglioramento: Dogana"
+		French:"Peut construire l'amélioration suivante: Douanes"
+		Romanian:"Poate construi îmbunătățire: Punct vamal"
+		Simplified_Chinese:"可以建造设施：海关"
+		Portuguese:"Pode criar melhoria: Alfândega"
+		Russian:"Можно построить улучшение: таможня"
+		German:"Kann Verbesserung errichten: Zollhaus"
+	}
+
 	"Great Engineer":{	
 		Italian:"Grande Ingegnere"
 		Russian:"Великий инженер"
@@ -992,6 +1210,28 @@
 		German:"Großer Ingenieur"
 	}
 
+	"Can speed up construction of a wonder":{
+		Spanish:"Puede acelerar la construccion de una maravilla"
+		Italian:"Può accelerare la costruzione di una Meraviglia"
+		French:"Peut accélérer la construction d'une Merveille"
+		Romanian:"Poate accelera construirea unei minuni"
+		Simplified_Chinese:"可以加快一座奇观的建造速度"
+		Portuguese:"Pode acelerar a construção de uma maravilha"
+		German:"Kann die Produktion eines Wunders beschleunigen"
+		Russian:"Может ускорить строительство чудо"
+	}
+
+	"Can build improvement: Manufactory":{
+		Italian:"Può costruire il miglioramento: Manifattura"
+		French:"Peut construire l'amélioration suivante: Manufacture"
+		Romanian:"Poate construi îmbunătățire: fabrică"
+		Simplified_Chinese:"可以建造设施：制造中心"
+		Portuguese:"Pode construir melhoria: Fábrica"
+		German:"Kann Verbesserung errichten: Manufaktur"
+		Russian:"Можно построить улучшение: мануфактура"
+		Spanish:"Se puede construir mejora: Manufactura"
+	}
+
 	"Great General":{
 		Italian:"Grande Generale"
 		Romanian:"Mare General"
@@ -1002,6 +1242,12 @@
 		French:"Général illustre"
 	}
 	
+	"Bonus for land units in 2 radius 15%" :{
+		Italian:"15% Bonus per le unità terrestri nel raggio di 2 caselle"
+		Simplified_Chinese:"周围两格地块内的我方所有陆军单位+15%战斗力"
+        	French:"Bonus de combat +15% pour les unités terrestres dans un rayon de 2 cases"
+	}
+
 	////// Unit Promotions
 
 	"Pick promotion":{
@@ -1215,14 +1461,6 @@
 		Simplified_Chinese:"猛烈冲锋"
 	}
 
-	"Bonus vs wounded units 33%":{
-		Italian:"+33% forza contro unità ferite"
-		French:"+33% force contre les unités montées"
-		Russian:"Бонус против раненых 33%"
-		Simplified_Chinese:"对战受伤单位时+33%战斗力"
-
-	}
-
 	"wounded units":{
 		Italian:"unità ferite"
 		French:"unités blessés"
@@ -1253,6 +1491,10 @@
 		Simplified_Chinese:"齐射能力"
 	}
 
+	"Bonus vs City 50%":{
+		Simplified_Chinese:"攻击城市时+50%战斗力"
+	}
+
 	"Sentry":{
 		Italian:"Sentinella"
 		German:"Wache"
@@ -1277,14 +1519,6 @@
 		Simplified_Chinese:"+1射程"
 	}
 
-	"Indirect Fire":{
-		Italian:"Fuoco indiretto"
-		German:"Indirektes Feuer"
-		French:"Attaque indirecte" //not sure
-		Russian:"Непрямой Огонь"
-		Simplified_Chinese:"间接火力"
-	}
-
 	"Ranged attacks may be performed over obstacles":{
 		Italian:"Permette di sparare a distanza superando gli ostacoli"
 		French:"Les attaques à distances peuvent être effectués à travers des obstacles"
@@ -1407,6 +1641,10 @@
 		Simplified_Chinese:"海掠I级"
 	}
 
+	"Bonus vs City 15%":{
+		Simplified_Chinese:"攻击城市时+15%战斗力"
+	}
+
 	"Coastal Raider II":{
 		Italian:"Incursione costiera II"
 		German:"Küstenräuber II"
@@ -1455,6 +1693,10 @@
 		Simplified_Chinese:"狼群I级"
 	}
 
+	"Bonus as Attacker 25%":{
+		Simplified_Chinese:"主动攻击时+25%战斗力"
+	}
+
 	"Wolfpack II":{
 		Italian:"Attacco in massa II"
 		German:"Rudeltaktik II"
@@ -1479,12 +1721,37 @@
 		Simplified_Chinese:"狼群III级"
 	}
 	
+	"Woodsman":{
+		Simplified_Chinese:"林地幽灵"
+	}
+
+	"Double movement rate through Forest and Jungle":{
+		Simplified_Chinese:"森林和丛林移动时双倍移动力"
+	}
+
 	"Heal Instantly":{
 		Italian:"Cura istantanea"
+		Simplified_Chinese:"浴火重生"
 	}
 	"Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion":{
 		Italian:"Cura l'unità di 50 PF, rinunciando però all'opportunità di scegliere una promozione."
+		Simplified_Chinese:"立即回复50生命值，同时放弃本次晋升机会"
 	}
 
+	"Medic":{
+		Simplified_Chinese:"治疗I"
+	}
+
+	"This unit and all others in adjacent tiles heal 5 additional HP per turn":{
+		Simplified_Chinese:"本单位及其相邻单位每回合额外回复5生命值"
+	}
+
+	"Medic II":{
+		Simplified_Chinese:"治疗II"
+	}
+
+	"This unit and all others in adjacent tiles heal 5 additional HP. This unit heals 5 additional HP outside of friendly territory.":{
+		Simplified_Chinese:"本单位及其相邻单位每回合额外回复5生命值，该单位在己方领土以外每回合额外回复5生命值"
+	}
 
 }
diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt
index 9f328a34c6..38aec6f58f 100644
--- a/core/src/com/unciv/logic/city/CityInfo.kt
+++ b/core/src/com/unciv/logic/city/CityInfo.kt
@@ -44,7 +44,7 @@ class CityInfo {
         this.location = cityLocation
         setTransients()
 
-        val nationCities = civInfo.getNation().cities
+        val nationCities = civInfo.getTranslatedNation().cities
         val cityNameIndex = civInfo.citiesCreated % nationCities.size
         val cityName = nationCities[cityNameIndex]