Merge remote-tracking branch 'origin/main' into hotfixes

Author: SneakBug8

assets/alice.gui

@@ -1,4 +1,14 @@
 guiTypes = {
+	guiButtonType = {
+		name = "observer_button"
+		extends = "lobby"
+		position = { x = 17 y = -200 }
+		quadTextureSprite ="GFX_frontend_play_button"	
+		buttonText = "alice_observer_btn_text"
+		buttonFont = "vic_32_black"
+		Orientation = "LOWER_LEFT"
+	}
+			
 	iconType = {
         name = "gfx_storage_unit_types"
         spriteType = "GFX_unit_strip"
@@ -4631,6 +4641,23 @@ guiTypes = {
 		quadTextureSprite = "GFX_take_province"	
 	}
 
+	iconType = {
+		name ="province_victory_points_icon"
+		extends = "province_view_header"
+		spriteType = "GFX_prestige_icon_2"
+		position = { x=125 y=43 }
+		Orientation = "UPPER_LEFT"
+	}
+	instantTextBoxType = {
+			name = "province_victory_points"
+			extends = "province_view_header"
+			position = { x=140 y =45}
+			borderSize = { 0 0}
+			maxsize = { 50 20 }
+			textureFile = ""
+			font = "vic_18"
+	}
+
 	instantTextBoxType = {
 			name = "ready_state"
 			extends = "ingame_multiplayer_entry"

assets/localisation/en-US/alice.csv

@@ -955,6 +955,13 @@ alice_province_selector_on;ON
 alice_province_selector_off;OFF
 province_selector;Selector
 province_immigrator;Immigrator
+province_victory_points;Victory points represent relative worth of the province to other provinces in the country when calculating occupation score in wars.
+province_victory_points_base;?G+1 point base?W
+province_victory_points_nb;?G+$X$ points for naval base level?W
+province_victory_points_fcount;?G+$X$ points for factories?W
+province_victory_points_fortsize;?G+$X$ points for fort level?W
+province_victory_points_mainlandcore;?Gx2 for non-overseas core?W
+province_victory_points_capital;?Gx3 for nation capital?W
 tt_a_bank;a bank
 tt_a_university;a university
 et_add_selector;enable province selector
@@ -1036,6 +1043,7 @@ disband_all;Disband all selected units
 alice_play_checksum_host;Checksum mismatch with host, ensure you have the same mods and savefiles
 alice_play_save_stream;Host is streaming a save to you, wait until it completes
 alice_no_start_game_player_loading;Cannot start the game while players are loading
+alice_no_start_game_invalid_nations;Cannot start the game while players are on non-existant nations
 ai_will_accept_po;They will accept this offer
 ai_will_not_accept_po;They will NOT accept this offer
 close_and_del;Close & Delete Factory
@@ -1338,9 +1346,13 @@ trade_nation_data;Domestic
 trade_good_stats_global;Nations
 trade_good_stats_markets;Markets
 trade_good_name_header;Trade good
+per_nation;Per nation
 price;Price
+labour_price;Wage
+labour_price_10k;Wage(10k people)
 supply;Supply
 demand;Demand
+supply_demand_ratio;Supply-demand ratio
 balance;Balance
 market_stockpiles;In stock
 national_stockpile;Government Stockpile
@@ -1553,3 +1565,19 @@ alice_host_has_resync;Host has resynced the lobby
 alice_naval_coordination_penalty;The $x$ are receiving a naval coordination penalty of ?R$y$?W from outnumbering their enemy, which reduces their target selection by ?R$val$?W
 alice_naval_coordination_bonus;The $x$ are receiving a naval coordination bonus of ?G$y$?W from being outnumbered, which increases their target selection by ?G$val$?W
 alice_naval_stacking_penalty;The $x$ are receiving a damage multiplier of ?R$y$?W from stacking penalties.
+alice_observer_btn_text;Play as observer
+alice_observer_already_observer_tooltip;You are already on the observer tag.
+alice_labor_no_education;Unskilled
+alice_labor_basic_education;Skilled
+alice_labor_high_education;Expert
+alice_labor_guild;Guilds
+alice_labor_high_education_and_accepted;Expert(accepted)
+alice_invalid_value;Invalid value
+alice_wages_tab;Wages
+alice_trade_volume_tab;Trade volume
+economy_scene_embargo;Embargo!
+embargo_reason_war;War
+embargo_reason_origin_embargo;Origin declared embargo
+embargo_reason_origin_join_embargo;Origin joined embargo
+embargo_reason_target_embargo;Target declared embargo
+embargo_reason_target_join_embargo;Target joined embargo

assets/localisation/en-US/mapmodes.csv

@@ -95,6 +95,7 @@ mapmode_tooltip_34;Player: $x$
 mapmode_tooltip_34_you_sp;This is you! 
 mapmode_tooltip_34_you;Player: $x$ (This is you!) 
 mapmode_tooltip_34_ai;AI controlled
+mapmode_tooltip_34_no_ai;Not AI controlled
 mapmode_tooltip_35;Life needs satisfied: $x$
 mapmode_tooltip_36;Everyday needs satisfied: $x$
 mapmode_tooltip_37;Luxury needs satisfied: $x$

assets/localisation/zh-CN/alice.csv

@@ -1536,5 +1536,33 @@ alice_factory_construction_cost;施工成本：
 alice_factory_construction_explain_3;购买的商品价值：?Y$x$?W
 alice_factory_construction_explain_4;估计总价：?Y$x$?W
 alice_factory_construction_explain_5;进展：?Y$x$?W
-ledger_inflation_adjusted_gdp;GDP（通胀调整）添加注释 更多动作
+ledger_inflation_adjusted_gdp;GDP（通胀调整）
 ledger_inflation_adjusted_gdp_per_capita;每百万人平均 GDP（通胀调整）
+province_victory_points;胜利点，表示战时计算占领分，此省份相对于其他省份的价值。
+province_victory_points_base;?G+1 基本分?W
+province_victory_points_nb;?G+$X$ 海军基地等级积分?W
+province_victory_points_fcount;?G+$X$ 工厂积分?W
+province_victory_points_fortsize;?G+$X$ 要塞积分?W
+province_victory_points_mainlandcore;?Gx2 非海外积分?W
+province_victory_points_capital;?Gx3 首都积分?W
+per_nation;每个国家
+labour_price;工资
+labour_price_10k;一万人平均工资
+supply_demand_ratio;供需比
+alice_labor_no_education;新手
+alice_labor_basic_education;熟练
+alice_labor_high_education;专家
+alice_labor_guild;行会
+alice_labor_high_education_and_accepted;专家（已接受）
+alice_invalid_value;值 无效
+alice_wages_tab;工资
+alice_trade_volume_tab;贸易量
+economy_scene_embargo;禁运！
+embargo_reason_war;战争
+embargo_reason_origin_embargo;来源宣布禁运
+embargo_reason_origin_join_embargo;来源加入禁运
+embargo_reason_target_embargo;目标宣布禁运
+embargo_reason_target_join_embargo;目标加入禁运
+alice_no_start_game_invalid_nations;在玩家游玩不存在的国家时无法开始游戏
+alice_observer_btn_text;作为观察者游玩
+alice_observer_already_observer_tooltip;你已是观察者。