Merge branch 'pre0.5.3a' into develop

mod/thegreatwar/common/national_focus/bulgaria.txt

@@ -476,7 +476,6 @@ add_extra_state_shared_building_slots=1 add_building_construction={ type=arms_fa
 			756 = { remove_claim_by = BUL }
 			757 = { remove_claim_by = BUL }
 			759 = { remove_claim_by = BUL }
-			762 = { remove_claim_by = BUL }
 		}
 
 		ai_will_do = { factor = 0	}

mod/thegreatwar/common/technologies/industry.txt

@@ -392,7 +392,7 @@ technologies = {
 		}
 
 		research_cost = 1.5
-		start_year = 1936
+		start_year = 1922
 
 		folder = {
 			name = industry_folder
@@ -416,7 +416,7 @@ technologies = {
 		}
 
 		research_cost = 1.5
-		start_year = 1916
+		start_year = 1936
 
 		folder = {
 			name = industry_folder

mod/thegreatwar/interface/countrystateview.gui

@@ -102,12 +102,13 @@ guiTypes = {
 
 			instantTextboxType = {
 				name = "claims"
-				position = { x = 35 y = 97 }
+				position = { x = 15 y = 97 }
 				textureFile = ""
 				font = "hoi_18mbs"
 				text = ""
-				maxWidth = 100
+				maxWidth = 140
 				maxHeight = 30
+				fixedsize = yes
 				format = center				
 			}
 
@@ -127,13 +128,14 @@ guiTypes = {
 				text = ""
 				maxWidth = 140
 				maxHeight = 30
+				fixedsize = yes
 				format = center
 			}
 
 			buttonType = {
 				name = "owner_flag"
 				quadTextureSprite ="GFX_flag_small2"
-				position = { x= 34 y = 62 }
+				position = { x= 34 y = 63 }
 			}
 
 			iconType ={
@@ -146,7 +148,7 @@ guiTypes = {
 			buttonType = {
 				name = "controller_flag"
 				quadTextureSprite = "GFX_flag_small2"
-				position = { x= 74 y = 62 }
+				position = { x= 74 y = 63 }
 			}	
 
 			iconType ={

mod/thegreatwar/localisation/additional.yml → mod/thegreatwar/localisation/additional_l_english.yml

@@ -1,4 +1,4 @@
-l_english:
+l_english:
  trench:0 "Trench"
  trench_plural:0 "Trenches"
  trench_desc:0 "Trenches are used to shelter troops. They provide a good defense bonus to the defender. When leading an assault, you should attack from multiple directions to reduce trenches effectiveness."

mod/thegreatwar/localisation/ww1_belgiumstuff_l_english.yml

@@ -4,39 +4,39 @@
  choose_wisely:0 "§GYour choice will affect target alliance. Choose wisely.§!"
  no_proceed_benilux_alliance:0 "§RYou cannot proceed with benilux alliance focus if you choose this focus.§!"
  fortify_belgium:0 "Build fortifications on borders"
- greater_benilux:0 "Greater Benilux"
- GBL_neutrality:0 "Greater Benilux"
- GBL_democratic:0 "Greater Benilux"
- GBL_fascism:0 "Greater Benilux"
- GBL_communism:0 "Greater Benilux"
+ greater_benilux:0 "Greater Benelux"
+ GBL_neutrality:0 "Greater Benelux"
+ GBL_democratic:0 "Greater Benelux"
+ GBL_fascism:0 "Greater Benelux"
+ GBL_communism:0 "Greater Benelux"
 
  ##### Focuses #####
  BEL_diplomatic_effort:0 "Diplomatic Effort"
  BEL_diplomatic_effort_desc:0 "TODO"
- BEL_benilux_focus:0 "Benilux Focus"
+ BEL_benilux_focus:0 "Benelux Focus"
  BEL_benilux_focus_desc:0 "TODO"
  BEL_entente_focus:0 "Entente Friendship"
  BEL_entente_focus_desc:0 "TODO"
  BEL_germany_focus:0 "Central Powers Friendship"
  BEL_germany_focus_desc:0 "TODO"
  BEL_neutrality_focus:0 "Neutrality Focus"
  BEL_neutrality_focus_desc:0 "TODO"
- BEL_ally_benilux:0 "Benilux Alliance"
+ BEL_ally_benilux:0 "Benelux Alliance"
  BEL_ally_benilux_desc:0 "TODO"
- BEL_conquer_benilux:0 "Conquer Benilux"
+ BEL_conquer_benilux:0 "Conquer Benelux"
  BEL_conquer_benilux_desc:0 "TODO"
  BEL_major_alliance:0 "Choose Side"
  BEL_major_alliance_desc:0 "TODO"
  BEL_fortify_borders:0 "Fortify Borders"
  BEL_fortify_borders_desc:0 "TODO"
  BEL_demand_eupen:0 "Demand Eupen"
  BEL_demand_eupen_desc:0 "TODO"
- BEL_unite_benilux:0 "Unite Benilux"
+ BEL_unite_benilux:0 "Unite Benelux"
  BEL_unite_benilux_desc:0 "TODO"
 
  ##### Events #####
  ww1_belgium.2.t:0 "Belgium proposes alliance"
- ww1_belgium.2.d:0 "Today we recieved message that Belgium wants to invite us in their alliance. They propose unite Benilux and create new strong alliance. What should we do?"
+ ww1_belgium.2.d:0 "Today we recieved message that Belgium wants to invite us in their alliance. They propose unite Benelux and create new strong alliance. What should we do?"
  ww1_belgium.2.a:0 "That is good proposal"
  ww1_belgium.2.b:0 "No"
  ww1_belgium.3.t:0 "Belgium demands subjugation"
@@ -47,10 +47,10 @@
  ww1_belgium.4.d:0 "Eupen always was a Belgium territory. Now they demand their rightful lands. Belgium is not so strong, but should we start war for small piece of land?"
  ww1_belgium.4.a:0 "It is their historical land after all"
  ww1_belgium.4.b:0 "No, it is german territory"
- ww1_belgium.5.t:0 "Unite Benilux"
- ww1_belgium.5.d:0 "We think it's time for uniting Benilux. We will unite people of Benilux Region under our rule."
+ ww1_belgium.5.t:0 "Unite Benelux"
+ ww1_belgium.5.d:0 "We think it's time for uniting Benelux. We will unite people of Benelux Region under our rule."
  ww1_belgium.5.a:0 "We will send demand to our neighbours"
- ww1_belgium.5.b:0 "We already control Benilux"
+ ww1_belgium.5.b:0 "We already control Benelux"
 
  BEL_ww1_army_effort:0 "Military Modernization"
  BEL_ww1_army_effort_desc:0 "Many of our rifles, cannons, tools, and, unfortunately, military leaders are relics of a bygone era. With the Maxim Gun now not only fabricated, but on a large scale, we simply have no choice but to get with the times. The quicker we bring these new weapons into circulation, and bring in experts who know how to use them, the quicker our military can become a modern, effective fighting force."

mod/thegreatwar/localisation/ww1_opinion_l_english.yml

@@ -53,6 +53,6 @@ HOI4TGW_Opinion_diplomats_malus:0 "Diplomatic Malus"
 # Remove -100
 HOI4TGW_Opinion_Russia_Leave_Entente:0 "Russian Empire leaves Entente"
 
-benilux_friendship:0 "Benilux Friendship"
+benilux_friendship:0 "Benelux Friendship"
 entente_friendship:0 "Entente Friendship"
 germany_friendship:0 "Germany Friendship"

mod/thegreatwar/localisation/ww1_states_l_english.yml

@@ -20,7 +20,7 @@
  STATE_759:0 "East Macedonia"
  STATE_760:0 "South Serbia"
  STATE_761:0 "East Montenegro"
- STATE_762:0 "Silesian Voivodeship"
+ STATE_762:0 "Silesia"
  STATE_763:0 "Walvis Bay"
  STATE_764:0 "Aegean Islands"
  STATE_765:0 "Jabal Shammar"
@@ -36,4 +36,4 @@
  STATE_776:0 "Hwanghae"
  STATE_777:0 "Northern Gangwon"
  STATE_778:0 "PyeongAn"
- STATE_779:0 "Southern Bulgaria"
+ STATE_779:0 "East Rumelia"

mod/thegreatwar/localisation/ww1_techs_l_english.yml

@@ -117,8 +117,6 @@ ww1_medicine5_desc:0 "Though our field surgeons are now all well and good, we ca
 
 
 
-
- trench:0 "Trench"
  MODIFIER_PRODUCTION_OIL_FACTOR:0 "Oil"