Merge pull request #164 from NicolasGrosjean/develop

Add some French translations
Resolved conflict with PR #158 /patch-30 in the

mod/thegreatwar/common/bookmarks/powderkeg.txt

@@ -205,7 +205,7 @@ bookmarks = {
 
 		"HOL"={
 			minor = yes
-			history = "MEX_POWDERKEG_DESC"
+			history = "HOL_POWDERKEG_DESC"
 			ideology = democratic
 			ideas = {
 
@@ -216,7 +216,7 @@ bookmarks = {
 		}
 		"QIN"={
 			minor = yes
-			history = "MEX_POWDERKEG_DESC"
+			history = "QIN_POWDERKEG_DESC"
 			ideology = neutrality
 			ideas = {
 

mod/thegreatwar/common/bookmarks/schlieffen.txt

@@ -212,7 +212,7 @@ bookmarks = {
 
 		"HOL"={
 			minor = yes
-			history = "MEX_POWDERKEG_DESC"
+			history = "HOL_SCHLIEFFEN_DESC"
 			ideology = democratic
 			ideas = {
 
@@ -223,7 +223,7 @@ bookmarks = {
 		}
 		"CHI"={
 			minor = yes
-			history = "MEX_POWDERKEG_DESC"
+			history = "CHI_SCHLIEFFEN_DESC"
 			ideology = neutrality
 			ideas = {
 

mod/thegreatwar/events/KiS_NewsEvents.txt

@@ -4,8 +4,8 @@
 #____________________________________________________________
 news_event = {
 	id=kis_news.4
-	title="Albanian Revolt"
-	desc="The Albanians refused to submit to the Turks. A new Albanian uprisings began in Kosovo and the northern mountains. Ottoman government declared martial law and sent a military expedition."
+	title = kis_news.4.t
+	desc = kis_news.4.d
 
 	picture=EVENT_hoi4tgw_albanian_revolt
 
@@ -25,7 +25,7 @@ news_event = {
 	}
 
 	option = {
-		name = "The Balkans are a powder keg..."
+		name = kis_news.4.a
 		trigger = {
 			NOT = { TAG = ALB } #
 		}
@@ -37,8 +37,8 @@ news_event = {
 #____________________________________________________________
 news_event = {
 	id = kis_news.5
-	title = "Boer Revolt"
-	desc = "A revolt whith men who supported the recreation of a Boer South African Republic rose up against the government of the Union of South Africa."
+	title = kis_news.5.t
+	desc = kis_news.5.d
 	picture = kis_news_5
 
 	major = yes
@@ -55,7 +55,7 @@ news_event = {
 	}
 
 	option = {
-		name = "An another revolt in Africa..."
+		name = kis_news.5.a
 	}
 }
 #____________________________________________________________

mod/thegreatwar/events/WW1_Britain.txt

@@ -62,8 +62,8 @@ news_event = {
 #____________________________________________________________
 news_event = {
 	id=ww1_england.101
-	title="South Africa Independence"
-	desc="South Africa came into being on 31 May, 1910 with the unification of the previously separate colonies of the Cape Natal, Transvaal and the Orange Free State. The Union of South Africa was founded as a dominion of the British Empire."
+	title=ww1_england.101.t
+	desc=ww1_england.101.d
 	picture=EVENT_hoi4tgw_south_africa_act
 
 	major = yes
@@ -100,7 +100,7 @@ news_event = {
 	}
 
 	option = {
-		name = "The Union is formed!"
+		name = ww1_england.101.b
 		ai_chance = {
 			factor = 100
 		}
@@ -135,7 +135,7 @@ news_event = {
 	}
 
 	option = {
-		name = "They said the Titanic was unsinkable..."
+		name = ww1_england.102.a
 		ai_chance = {
 			factor = 100
 		}		
@@ -147,8 +147,8 @@ news_event = {
 #____________________________________________________________
 country_event = {
 	id = ww1_england.20
-	title = "Revolution in United-Kingdom"
-	desc = "Revolution in United-Kingdom"
+	title = ww1_england.20.t
+	desc = ww1_england.20.d
 	picture = GFX_report_event_gathering_protest
 
 	fire_only_once=yes

mod/thegreatwar/events/WW1_France.txt

@@ -57,14 +57,14 @@ country_event = {
 #____________________________________________________________
 country_event = {
 	id = ww1_france.15
-	title = "France sends l'Armée d'Orient"
-	desc = "Mobilize l'Armée d'Orient"
+	title = ww1_france.15.t
+	desc = ww1_france.15.d
 	picture=ww1_france_15
 
 	is_triggered_only=yes
 
 	option = {
-		name = "Send l'Armée d'Orient in Greece!"
+		name = ww1_france.15.a
 
 		FRA = {
 			load_oob="WW1_ArmeeOrient"

mod/thegreatwar/events/WW1_Germany.txt

@@ -130,8 +130,8 @@ country_event = {
 # Democrat Take Power
 country_event = {
 	id = ww1_germany.19
-	title = "Weimar Republic is Proclaimed."
-	desc = "A national assembly was convened in Weimar, where a new constitution for the German Reich was written."
+	title = ww1_germany.19.t
+	desc = ww1_germany.19.d
 	picture = GFX_report_event_gathering_protest
 
 	fire_only_once=yes
@@ -154,8 +154,8 @@ country_event = {
 #____________________________________________________________
 country_event = {
 	id=ww1_germany.20
-	title="Boer Revolt"
-	desc="A revolt occurend whith men who supported the recreation of a Boer South African Republic rose up against the government of the Union of South Africa."
+	title = ww1_germany.20.t
+	desc = ww1_germany.20.d
 	picture = GFX_report_event_swedish_soldier
 
 	fire_only_once=yes

mod/thegreatwar/events/WW1_Greece.txt

@@ -39,13 +39,13 @@ country_event = {
 #____________________________________________________________
 country_event = {
 	id = ww1_greece.5
-	title = "France sends l'Armée d'Orient"
-	desc = "France sends us an army to help us fight"
+	title = ww1_greece.5.t
+	desc = ww1_greece.5.d
 
 	is_triggered_only=yes
 
 	option = {
-		name = "This Army will help us!"
+		name = ww1_greece.5.a
 	}
 }
 #____________________________________________________________

mod/thegreatwar/events/WW1_Holland.txt

@@ -2,9 +2,9 @@
 
 news_event = {
 	id=ww1_holland.1
-	title="End of census kiesrecht"
+	title=ww1_holland.1.t
 
-	desc="Finally all men can vote! No longer we have to follow the rich! This is one of the first steps to improving our country."
+	desc=ww1_holland.1.d
 
 	picture=EVENT_hoi4tgw_Censuskiesrecht
   fire_only_once=yes
@@ -42,16 +42,16 @@ news_event = {
 
 
 	option = {
-		name = "Hurray for the Dutch nation!"
+		name = ww1_holland.1.a
 	}
 }
 
 ############
 news_event = {
 	id=ww1_holland.2
-	title="The potato revolution"
+	title=ww1_holland.2.t
 
-	desc="Today, there is unrest in the Netherlands, the communist part has staged a coup and they are using war as a motivation for the Dutch people to support to communists. Will this be a new beacon for communism around the world?"
+	desc=ww1_holland.2.d
 
 	picture=EVENT_hoi4tgw_PotatoRev
 	fire_only_once=yes
@@ -86,6 +86,6 @@ news_event = {
 
 
 	option = {
-		name = "Terrible!"
+		name = ww1_holland.2.a
 	}
 }

mod/thegreatwar/events/WW1_Italianturkish.txt

@@ -201,8 +201,8 @@ country_event = {
 #____________________________________________________________
 country_event = {
 	id = ww1_italianturkish.6
-	title = "Ottomans joined a faction"
-	desc = "Ottomans joined a faction, we can't afford to fight on several fronts. We have to end the war."
+	title = ww1_italianturkish.6.t
+	desc = ww1_italianturkish.6.d
 	picture = GFX_report_event_generic_read_write
 
 	fire_only_once = yes
@@ -224,7 +224,7 @@ country_event = {
 	}
 
 	option = {
-		name = "Stop the War"
+		name = ww1_italianturkish.6.a
 		ITA = {
 			white_peace = TUR
 			set_country_flag = ITA_Lib_War_End_Victory
@@ -289,22 +289,22 @@ country_event = {
 #____________________________________________________________
 news_event = {
 	id = ww1_italianturkish.8
-	title = "Italian invasion of Libya"
-	desc = "An ultimatum was presented to the Ottoman government. Through Austrian intermediation, the Ottomans replied with the proposal of transferring control of Libya without war, maintaining a formal Ottoman suzerainty. The Italian refused, and war is now declared."
+	title = ww1_italianturkish.8.t
+	desc = ww1_italianturkish.8.d
 	picture = EVENT_hoi4tgw_italo_turkish_war
 
 	major = yes
 	is_triggered_only = yes
 
 	option = {
-		name = "A war for a piece of sand?"
+		name = ww1_italianturkish.8.a
 		trigger = { 
 			NOT = { TAG = ITA }
 			NOT = { TAG = TUR }
 		}
 	}
 	option = {
-		name = "Let's Fight!"
+		name = ww1_italianturkish.8.b
 		trigger = { 
 			TAG = ITA
 			TAG = TUR
@@ -317,28 +317,28 @@ news_event = {
 #____________________________________________________________
 news_event = {
 	id = ww1_italianturkish.9
-	title = "Italy Won the Italo-Turkish War"
-	desc = "Yesterday, Italy and the Ottoman Empire signed a treaty in Ouchy near Lausanne. The Ottomans would withdraw all military personnel from Trablus and Benghazi vilayets."
+	title = ww1_italianturkish.9.t
+	desc = ww1_italianturkish.9.d
 	picture = GFX_news_event_generic_sign_treaty2
 
 	major = yes
 	is_triggered_only = yes
 
 	option = {
-		name = "Italy won the Italo-turkish War"
+		name = ww1_italianturkish.9.a
 		trigger = { 
 			NOT = { TAG = ITA }
 			NOT = { TAG = TUR }
 		}
 	}
 	option = {
-		name = "A Great Victory!"
+		name = ww1_italianturkish.9.b
 		trigger = { 
 			TAG = ITA
 		}
 	}
 	option = {
-		name = "Let's go home..."
+		name = ww1_italianturkish.9.c
 		trigger = { 
 			TAG = TUR
 		}
@@ -350,28 +350,28 @@ news_event = {
 #____________________________________________________________
 news_event = {
 	id = ww1_italianturkish.10
-	title = "Ottoman Empire Won the Italo-turkish "
-	desc = "Italy lost the Italo-Turkish War."
+	title = ww1_italianturkish.10.t
+	desc = ww1_italianturkish.10.d
 	picture = GFX_news_event_generic_sign_treaty2
 
 	major = yes
 	is_triggered_only = yes
 
 	option = {
-		name = "Ottoman Empire won the Italo-turkish War"
+		name = ww1_italianturkish.10.a
 		trigger = { 
 			NOT = { TAG = ITA }
 			NOT = { TAG = TUR }
 		}
 	}
 	option = {
-		name = "Let's go home..."
+		name = ww1_italianturkish.10.b
 		trigger = { 
 			TAG = ITA
 		}
 	}
 	option = {
-		name = "A Great Victory!"
+		name = ww1_italianturkish.10.c
 		trigger = { 
 			TAG = TUR
 		}

mod/thegreatwar/events/WW1_Italy.txt

@@ -36,15 +36,15 @@ country_event = {
 #____________________________________________________________
 country_event = {
 	id=ww1_italy.5
-	title = "A fair Offer"
-	desc = "Austria-Hungary propose to give us South Tyrol and Istria if we promise to join them in case of war. Should We accept the offer ?"
+	title = ww1_italy.5.t
+	desc = ww1_italy.5.d
 	picture = ww1_italy_5
 
 	fire_only_once = yes
 	is_triggered_only=yes
 
 	option = {
-		name = "Accept the Offer"
+		name = ww1_italy.5.a
 		ai_chance={
 			factor = 99
 		}
@@ -60,7 +60,7 @@ country_event = {
 	}
 
 	option = {
-		name = "Decline the Offer"
+		name = ww1_italy.5.b
 		ai_chance={
 			factor = 1
 		}

mod/thegreatwar/events/WW1_Japan.txt

@@ -348,8 +348,8 @@ news_event = {
 #____________________________________________________________
 country_event = {
 	id = ww1_japan.101
-	title = "Japan Nationalism"
-	desc = "Japan is the Center of the World, with its ruler, the Emperor, a divine being, who derives his divinity from ancestral descent from the great Amaterasu-Omikami, the Goddess of the Sun herself."
+	title = ww1_japan.101.t
+	desc = ww1_japan.101.d
 	picture = GFX_report_event_fascist_gathering
 
 	fire_only_once=yes
@@ -361,7 +361,7 @@ country_event = {
 
 
 	option = {
-		name = "The Emperor is now a Puppet..."
+		name = ww1_japan.101.a
 		add_popularity = {
 			ideology = fascism
 			popularity = 0.51
@@ -381,8 +381,8 @@ country_event = {
 #____________________________________________________________
 country_event = {
 	id = ww1_japan.102
-	title = "Taisho Democracy"
-	desc = "The Taisho Era is now called Taisho Democracy as Japan enjoyed a climate of political liberalism unforeseen after decades of Authoritarianism."
+	title = ww1_japan.102.t
+	desc = ww1_japan.102.d
 	picture = GFX_report_event_gathering_protest
 
 	fire_only_once=yes
@@ -393,7 +393,7 @@ country_event = {
 	}
 
 	option = {
-		name = "We are Free!"
+		name = ww1_japan.102.a
 		add_popularity = {
 			ideology = democratic
 			popularity = 0.51