Merge branch 'master' of https://github.com/yairm210/UnCiv

android/assets/jsons/Translations/Buildings.json

@@ -55,6 +55,7 @@
 	}
 	
 	"Must not be on plains":{
+		French:"Ne doit pas être sur une plaine"
 	}
 
 	"Stonehenge":{	
@@ -861,6 +862,7 @@
 
 	"+5% Production for every Trade Route with a City-State in the empire":{
 		Italian:"+5% Produzione per ogni Rotta Commerciale con una Città-Stato nell'impero"
+		French:"+5% de production pour chaque routes commerciales connectées à une Cité état"
 	}
 
 	/*
@@ -976,6 +978,7 @@
 	}
 	
 	"Must not be on hill":{
+		French:"Doit être sur une colline"
 	}
 
 	"Museum":{	

android/assets/jsons/Translations/Diplomacy,Trade,Nations.json

@@ -264,6 +264,7 @@
 
 	"Provides land units every 20 turns at 30 Influence":{
 		Italian:"Concede un'unità terrestre ogni 20 turni a minimo 30 Punti Influenza"
+		French:"Fournit des unités terrestres tous les 20 tours à 30 d'influence"
 	},
 
 	"Gift [goldAmount] gold":{
@@ -367,35 +368,44 @@
 	// Demands
 	"Demands":{
 		Italian:"Richieste"
+		French:"Demandes"
 	}
 	"Please don't settle new cities near us.":{
 		Italian:"Smetti di fondare città vicino a noi."
+		French:"Veuillez ne pas construire de villes proches de nous."
 	}
 	"Very well, we shall look for new lands to settle.":{
 		Italian:"Ti porgiamo le nostre scuse."
+		French:"Très bien, nous chercherons d'autres terres à coloniser"
 	}
 	"We shall do as we please.":{
 		Italian:"Colonizzeremo la terra che ci pare e piace."
+		French:"Nous faisons ce que nous voulons."
 	}
 	
 	"You betrayed your promise to not settle cities near us":{
 		Italian:"Hai tradito la tua promessa di non fondare città nelle nostre vicinanze."
+		French:"Vous avez trahis votre promesse de ne pas fonder de ville proche de nous"
 	}
 	
 	"You fulfilled your promise to stop settling cities near us!":{
 		Italian:"Hai mantenuto la tua promessa di non fondare città nelle nostre vicinanze."
+		French:"Vous avez tenu votre promesse de ne pas fonder de ville proche de nous!"
 	}
 	
 	"You refused to stop settling cities near us":{
 		Italian:"Hai continuato a fondare città nelle nostre vicinanze."
+		French:"Vous avez refusez de ne pas fonder de villes proches de nous"
 	}
 	
 	"We noticed your new city near our borders, despite your promise. This will have....implications.":{
 		Italian:"Abbiamo notato la la tua nuova città vicino ai nostri confini. E questo avrà... ripercussioni sui nostri rapporti."
+		French:"Nous avons remarquez votre nouvelle ville à notre frontière, malgré votre promesse. Cela aura des... conséquences."
 	}
 	
 	"Your arrogant demands are in bad taste":{
 		Italian:"Hai fatto una richiesta arrogante."
+		French:"Vos arrogantes demandes sont de mauvais goût"
 	}
 	
 	
@@ -404,18 +414,22 @@
 	
 	"Cultured":{
 		Italian:"Acculturata"
+		French:"Cultivée"
 	}
 	
 	"Maritime":{
 		Italian:"Marittima"
+		French:"Maritime" //same
 	}
 	
 	"Mercantile":{
 		Italian:"Mercantile"
+		//same in french
 	}
 
 	"Militaristic":{
 		Italian:"Militaristica"
+		French:"Militarisée"
 	}
 
 ////// Trade	
@@ -693,6 +707,7 @@
 
 	"Nebuchadnezzar II":{//Babylonian Leader
 		Italian:"Nabucodonosor II"
+		French:"Nabuchodonosor II"
 	}
 	
 	"Greece":{	
@@ -708,6 +723,7 @@
 
 	"Alexander":{
 		Italian:"Alessandro"
+		French:"Alexandre le Grand"
 	}
 
 	"China":{	
@@ -745,6 +761,7 @@
 
 	"Ramesses II":{
 		Italian:"Ramses II"
+		French:"Ramsès II"
 	}
 
 	"+20% production towards Wonder construction":{
@@ -771,6 +788,7 @@
 
 	"Elizabeth":{
 		Italian:"Elisabetta"
+		//same in french
 	}
 
 	"+2 movement for all naval units":{
@@ -797,6 +815,7 @@
 
 	"Napoleon":{
 		Italian:"Napoleone"
+		French:"Napoléon"
 	}
 
 	"+2 Culture per turn from cities before discovering Steam Power":{
@@ -823,6 +842,7 @@
 
 	"Catherine":{
 		Italian:"Caterina II"
+		French:"Catherine II"
 	}
 
 	"Strategic Resources provide +1 Production, and Horses, Iron and Uranium Resources provide double quantity":{
@@ -849,6 +869,7 @@
 
 	"Augustus Caesar":{
 		Italian:"Cesare Augusto"
+		French:"Jule César"
 	}
 
 	"+25% Production towards any buildings that already exist in the Capital":{
@@ -876,6 +897,7 @@
 
 	"Harun al-Rashid":{
 		Italian:"Harun al-Rashid" //Same as Italian
+		French:"Hâroun ar-Rachîd"
 	}
 
 	"+1 Gold from each Trade Route, Oil resources provide double quantity":{
@@ -898,6 +920,7 @@
 
 	"George Washington":{
 		Italian:"George Washington" //Same as Italian
+		//same in french
 	}
 
 	"All land military units have +1 sight, 50% discount when purchasing tiles":{
@@ -924,6 +947,7 @@
 
 	"Oda Nobunaga":{
 		Italian:"Oda Nobunaga" //Same as Italian
+		//same in french
 	}
 
 	"Units fight as though they were at full strength even when damaged":{
@@ -946,10 +970,12 @@
 
 	"Otto von Bismark":{
 		Italian:"Otto von Bismark" //Same as Italian
+		French:"Otto von Bismarck"
 	}
 
 	"67% chance to earn 25 Gold and recruit a Barbarian unit from a conquered encampment. -25% land units maintenance.":{
 		Italian:"67% di probabilità di ottenere 25 Oro e reclutare un'unità barbara da un accampamento catturato. -25% mantenimento delle unità terrestri."
+		French:"67% de chance de gagner 25 or et d'enroler une unité barbare lors de la prise d'un campement barbare. -25% de coût de maintenance pour les unités terrestres."
 	}
 	
 	"India":{
@@ -960,6 +986,7 @@
 
 	"Gandhi":{
 		Italian:"Gandhi" //Same as Italian
+		//same in french
 	}
 
 	"Unhappiness from number of Cities doubled. Unhappiness from number of Citizens halved.":{
@@ -976,6 +1003,7 @@
 
 	"Suleiman I":{
 		Italian:"Solimano I"
+		French:"Soliman le Magnifique"
 	}
 
 	"Pay only one third the usual cost for naval unit maintenance. Melee naval units have a 1/3 chance to capture defeated naval units.":{

android/assets/jsons/Translations/Notifications.json

@@ -164,6 +164,7 @@
 
  	"One of our trades with [nation] has been cut short": {
 		Italian:"Un nostro accordo con [nation] è stato interrotto."
+		French:"L'un de nos accord commercial avec [nation] s'est arrêté"
 	},
 
 	"[cityname] has expanded its borders!":{
@@ -310,18 +311,22 @@
 		
 	"Our [attackerName] was destroyed by an intercepting [interceptorName]":{
 		Italian:"La nostra unità [attackerName] è stata distrutta dall'intercettante [interceptorName]"
+		French:"Notre [attackerName] a été intercepté et détruit par un(e) [interceptorName] ennemie"
 	}
 
 	"Our [interceptorName] intercepted and destroyed an enemy [attackerName]":{
 		Italian:"La nostra unità [interceptorName] ha intercettato e distrutto l'unità nemica [attackerName]"
+		French:"Notre [interceptorName] a intercepté et détruit un(e) [attackerName] ennemie"
 	}
 		
 	"Our [$attackerName] was attacked by an intercepting [$interceptorName]":{
 		Italian:"La nostra unità [$attackerName] è stata attaccata dall'intercettante [$interceptorName]"
+		French:"Notre [$attackerName] a été intercepté par un(e) [$interceptorName] ennemie"
 	}
 		
 	"Our [$interceptorName] intercepted and attacked an enemy [$attackerName]":{
 		Italian:"La nostra unità [$interceptorName] ha intercettato e attaccato l'unità nemica [$attackerName]"
+		French:"Notre [$interceptorName] a intercepté un(e) [$attackerName] ennemie"
 	}
 		
 	"An enemy [unit] was spotted near our territory":{
@@ -379,6 +384,7 @@
 
 	"The City-State of [name] has been destroyed!":{
 		Italian:"La Città-Stato di [name] è stata distrutta!"
+		French:"La Cité état [name] a été détruite"
 	}
 		
 	"We have captured a barbarian encampment and recovered [goldAmount] gold!":{ //shouldn't it be "we have destroyed ..." ?
@@ -388,6 +394,7 @@
 		
 	"A barbarian [unitType] has joined us!":{
 		Italian:"L'unità barbarica [unitType] si è unita a noi!"
+		French:"Un [unitType] barbare nous a rejoins!"
 	}
 		
 	/////////////////	ruins
@@ -470,21 +477,26 @@
 
 	"You're losing control of [name].":{ //When you're about to lose your friendship with a City-State
 		Italian:"Stai perdendo il controllo di [name]."
+		French:"Vous perdez le contrôle de [name]"
 	}
 
 	"You and [name] are no longer friends!":{ // When you lose friendship with a City-State (Relationship fall less than 30)
 		Italian:"Non sei più amico di [name]!"
+		French:"Vous et [name] n'êtes plus amis!"
 	}
 
 	"Your alliance with [name] is faltering.":{ //When you're about to lose your alliance with a City-State
 		Italian:"L'alleanza con [name] si sta sfaldando."
+		French:"Votre alliance avec [name] est vacillante."
 	}
 
 	"You and [name] are no longer allies!":{ // When you lose alliance with a City-State (Relationship fall less than 60)
 		Italian:"Non sei più alleato con [name]!"
+		French:"Vous et [name] n'êtes plus alliés!"
 	},
 
 	"[civName] gave us a [untiName] as gift near [cityName]!":{ // When a city state gives a unit as gift.
 		Italian:"[civName] ci ha dato [untiName] come regalo vicino a [cityName]!"
+		French:"[civName] nous offre un(e) [untiName] prêt de [cityName]!"
 	}
 }

android/assets/jsons/Translations/Other.json

@@ -422,6 +422,7 @@
 	
 	"Start Golden Age":{
 		Italian:"Inizia Età dell'Oro"
+		French:"Commencer un Age d'Or"
 	}
 	
 	"Yes":{
@@ -451,6 +452,7 @@
 
 	"Acquire":{
 		Italian:"Prendi"
+		French:"Acquérir"
 	}
 
 /////// Stats / Basics ressources
@@ -1096,6 +1098,7 @@
 	
 	"National Wonder":{
 		Italian:"Meraviglia Nazionale"
+		French:"Merveille Nationale"
 	}
 	
 	"Wonders enabled":{
@@ -1546,11 +1549,11 @@
 		Simplified_Chinese:"奇观"
 		Portuguese:"Maravilhas"
 	}
-	
+	/*
-	"National Wonders":{
+	"National Wonders":{ // already here at line 1099
 		Italian:"Meraviglie Nazionali"
 	}
-
+	*/
 	"Specialist Buildings":{
 		Italian:"Edifici specialisti"
 		Romanian:"Clădiri specializate"
@@ -1584,8 +1587,9 @@
 		German:"Bevölkerung"
 	}
 
-	"City States":{	
+	"City States":{	//I think that it's already elsewhere
 		Italian:"Città-Stato"
+		French:"Cité état"
 	}
 
 	"Luxury resources":{	
@@ -1817,22 +1821,27 @@
 
 	"Our status":{
 		Italian:"I nostri status"
+		French:"Notre situation"
 	}
 
 	"Global status":{
 		Italian:"Status Globale"
+		French:"Situation globale"
 	}
 
 	"Spaceships parts remaining":{
 		Italian:"Parti dell'astronave rimanenti"
+		French:"Parties de Vaisseau spatial manquantes"
 	}
 
 	"Branches completed":{
 		Italian:"Rami completati"
+		French:"Branches complêtées"
 	}
 
 	"Undefeated civs":{
 		Italian:"Civiltà esistenti"
+		French:"Civilization invaincues"
 	}
 	
 	
@@ -1840,14 +1849,17 @@
 
 	"What would you like to do with the city?":{
 		Italian:"Cosa vorresti farne della Città?"
+		French:"Que voulez vous faire de cette ville?"
 	}
 
 	"Annex":{
 		Italian:"Annetti"
+		French:"Annexer"
 	}
 
 	"Raze":{
 		Italian:"Radi al suolo"
+		French:"Razer"
 	}
 	
 	
@@ -1855,14 +1867,17 @@
 
 	"Remove your troops in our border immediately!":{
 		Italian:"Esigiamo che rimuoviate i vostri soldati dai nostri confini!"
+		French:"Enlevez vos troupes de nos terres immédiatement!"
 	}
 
 	"Sorry.":{
 		Italian:"Ti porgiamo le nostre scuse."
+		French:"Désolé."
 	}
 
 	"Never!":{
 		Italian:"Non sia mai!"
+		French:"Jamais!"
 	}
 	
 ////// Civilopedia texts
@@ -1992,13 +2007,14 @@
 	"Rough Terrain":{
 		Italian:"Terreno accidentato"
 		German: "Unwegsames Gelände"
+		French:"Terrain abrupte"
 	}
 
 	" for ":{ //for example:+1 Gold for Gems,Gold,Silver
 		Italian:" per "
 		Simplified_Chinese:"，当建造在拥有下列资源的地块上时："
 		French:"par "
-	    Portuguese:"Por "
+		Portuguese:"Por "
 	}
 
 

android/assets/jsons/Translations/Units,Promotions.json

@@ -569,6 +569,7 @@
 
 	"Landsknecht":{
 		Italian:"Lanzichenecco"
+		French:"Lansquenet"
 	}
 
 	"Knight":{	
@@ -663,10 +664,12 @@
 	
 	"Janissary":{ // Ottoman unique
 		Italian:"Giannizzero"
+		French:"Janissaire"
 	}
 	
 	"Heals [amountHealed] damage if it kills a unit":{
 		Italian:"Cura [amountHealed] PF quando uccide un'unità nemica"
+		French:"Soigne [amountHealed] dégâts si il tue une unité"
 	}
 
 	"Minuteman":{ // american unique
@@ -713,10 +716,12 @@
 	
 	"Sipahi":{
 		Italian:"Sipahi"//same as in Italian
+		//same in french
 	}
 	
 	"No movement cost to pillage":{
 		Italian:"Nessun costo di movimento per il saccheggio"
+		French:"L'action pillage ne coûte pas de point de mouvement"
 	}
 	
 
@@ -973,6 +978,7 @@
 	
 	"[percent]% chance to intercept air attacks":{
 		Italian:"[percent]% probabilità di intercettare attacchi aerei"
+		French:"[percent]% chance d'intercepter une attaque aérienne"
 	}
 	
 	
@@ -1810,98 +1816,122 @@
 
 	"Targeting I (air)":{
 		Italian:"Puntamento aereo I"
+		French:"Visée I (air)"
 	}
 
 	"Targeting II (air)":{
 		Italian:"Puntamento aereo II"
+		French:"Visée II (air)"
 	}
 
 	"Targeting III (air)":{
 		Italian:"Puntamento aereo III"
+		French:"Visée III (air)"
 	}
 
 	"Air Repair":{
 		Italian:"Riparazione aerea"
+		French:"Réparation Aérienne"
 	}
 
 	"Unit will heal every turn, even if it performs an action":{
 		Italian:"L'unità guarisce ad ogni turno, anche quando esegue un'azione "
+		French:"L'unité se soignera à chaque tour, même si elle effectue une action"
 	}
 
 	"Operational Range":{
 		Italian:"Raggio operativo"
+		French:"Portée"
 	}
 
 	"+2 Range":{
 		Italian:"+2 Raggio"
+		French:"+2 Portée"
 	}
 
 	"Sortie":{
 		Italian:"Sortita"
+		//same in french
 	}
 
 	"1 extra Interception may be made per turn":{
 		Italian:"Può eseguire 1 Intercettazione extra per turno"
+		French:"1 interception supplémentaire par tour"
 	}
 
 	"Dogfighting I":{
 		Italian:"Duello aereo I"
+		French:"Combat aérien I" //official translate but not very accurate
 	}
 
 	"Bonus when performing air sweep [bonusAmount]%":{
 		Italian:"+[bonusAmount]% Forza nella distruzione delle difese aeree"
+		French:"Bonus de combat aérien +[bonusAmount]%"
 	}
 
 	"Dogfighting II":{
 		Italian:"Duello aereo II"
+		French:"Combat aérien II"
 	}
 
 	"Dogfighting III":{
 		Italian:"Duello aereo III"
+		French:"Combat aérien III"
 	}
 
 	"Interception I":{
 		Italian:"Intercettazione I"
+		//same in french
 	}
 
 	"Bonus when intercepting [bonusAmount]%":{
 		Italian:"+[bonusAmount]% Bonus d'intercettazione"
+		French:"Bonus d'interception +[bonusAmount]%"
 	}
 
 	"Interception II":{
 		Italian:"Intercettazione II"
+		//same in french
 	}
 
 	"Interception III":{
 		Italian:"Intercettazione III"
+		//same in french
 	}
 
 	"Siege I":{//Air
 		Italian:"Assedio I"
+		French:"Siège I"
 	}
 
-	"Bonus vs City 33%":{
+	"Bonus vs City 33%":{ //i think that it already exist somewhere
 		Italian:"+33% Forza contro le Città"
+		French:"Bonus contre les villes +33%"
 	}
 
 	"Siege II":{
 		Italian:"Assedio II"
+		French:"Siège II"
 	}
 
 	"Siege III":{
 		Italian:"Assedio III"
+		French:"Siège III"
 	}
 
 	"Bonus vs City 34%":{
 		Italian:"+34% Forza contro le Città"
+		French:"Bonus contre les villes +34%"
 	}
 
 	"Evasion":{
 		Italian:"Manovre evasive"
+		French:"Esquive"
 	}
 
 	"Reduces damage taken from interception by 50%":{
 		Italian:"Dimezza i danni da intercettazione contraerea"
+		French:"Réduit les dégâts des unités d'interception de 50%"
 	}
 
 }