Merge pull request #131 from OpenVicProject/ui-cleanup

Localisation and UI focus cleanup

5 files changed, 434 insertions, 405 deletions

diff --git a/game/localisation/en_GB/goods.csv b/game/localisation/en_GB/goods.csv
index 7e2c63c..9d41b6a 100644
--- a/game/localisation/en_GB/goods.csv
+++ b/game/localisation/en_GB/goods.csv
@@ -1,59 +1,59 @@
 
-,, Good Categories
-good_category_military,Military
-good_category_raw,Raw
-good_category_industrial,Industrial
-good_category_consumer,Consumer
+;; Good Categories
+good_category_military;Military
+good_category_raw;Raw
+good_category_industrial;Industrial
+good_category_consumer;Consumer
 
-,, Goods
-good_ammunition,Ammunition
-good_small_arms,Small Arms
-good_artillery,Artillery
-good_canned_food,Canned Food
-good_tanks,Tanks
-good_aeroplanes,Aeroplanes
+;; Goods
+good_ammunition;Ammunition
+good_small_arms;Small Arms
+good_artillery;Artillery
+good_canned_food;Canned Food
+good_tanks;Tanks
+good_aeroplanes;Aeroplanes
 
-good_coal,Coal
-good_cotton,Cotton
-good_dye,Dye
-good_iron,Iron
-good_oil,Oil
-good_precious_metal,Precious Metal
-good_rubber,Rubber
-good_silk,Silk
-good_sulphur,Sulphur
-good_timber,Timber
-good_tropical_wood,Tropical Wood
-good_wool,Wool
+good_coal;Coal
+good_cotton;Cotton
+good_dye;Dye
+good_iron;Iron
+good_oil;Oil
+good_precious_metal;Precious Metal
+good_rubber;Rubber
+good_silk;Silk
+good_sulphur;Sulphur
+good_timber;Timber
+good_tropical_wood;Tropical Wood
+good_wool;Wool
 
-good_steel,Steel
-good_cement,Cement
-good_machine_parts,Machine Parts
-good_glass,Glass
-good_fuel,Fuel
-good_fertilizer,Fertilizer
-good_explosives,Explosives
-good_clipper_convoys,Clipper Convoys
-good_steamer_convoys,Steamer Convoys
-good_electric_gears,Electric Gears
-good_fabric,Fabric
-good_lumber,Lumber
+good_steel;Steel
+good_cement;Cement
+good_machine_parts;Machine Parts
+good_glass;Glass
+good_fuel;Fuel
+good_fertilizer;Fertilizer
+good_explosives;Explosives
+good_clipper_convoys;Clipper Convoys
+good_steamer_convoys;Steamer Convoys
+good_electric_gears;Electric Gears
+good_fabric;Fabric
+good_lumber;Lumber
 
-good_paper,Paper
-good_cattle,Cattle
-good_fish,Fish
-good_fruit,Fruit
-good_grain,Grain
-good_tobacco,Tobacco
-good_tea,Tea
-good_coffee,Coffee
-good_opium,Opium
-good_automobiles,Automobiles
-good_telephones,Telephones
-good_wine,Wine
-good_liquor,Liquor
-good_regular_clothes,Regular Clothes
-good_luxury_clothes,Luxury Clothes
-good_furniture,Furniture
-good_luxury_furniture,Luxury Furniture
-good_radios,Radio
+good_paper;Paper
+good_cattle;Cattle
+good_fish;Fish
+good_fruit;Fruit
+good_grain;Grain
+good_tobacco;Tobacco
+good_tea;Tea
+good_coffee;Coffee
+good_opium;Opium
+good_automobiles;Automobiles
+good_telephones;Telephones
+good_wine;Wine
+good_liquor;Liquor
+good_regular_clothes;Regular Clothes
+good_luxury_clothes;Luxury Clothes
+good_furniture;Furniture
+good_luxury_furniture;Luxury Furniture
+good_radios;Radio
diff --git a/game/localisation/en_GB/mapmodes.csv b/game/localisation/en_GB/mapmodes.csv
index 7c2830d..34c3890 100644
--- a/game/localisation/en_GB/mapmodes.csv
+++ b/game/localisation/en_GB/mapmodes.csv
@@ -1,8 +1,8 @@
 
-,, Test Mapmodes
-mapmode_province,Province
-mapmode_region,Region
-mapmode_terrain,Terrain
-mapmode_index,Index
-mapmode_rgo,RGO
-mapmode_infrastructure,Infrastructure
+;; Test Mapmodes
+mapmode_province;Province
+mapmode_region;Region
+mapmode_terrain;Terrain
+mapmode_index;Index
+mapmode_rgo;RGO
+mapmode_infrastructure;Infrastructure
diff --git a/game/localisation/en_GB/menus.csv b/game/localisation/en_GB/menus.csv
index 0ae1509..a086e85 100644
--- a/game/localisation/en_GB/menus.csv
+++ b/game/localisation/en_GB/menus.csv
@@ -1,102 +1,131 @@
 
-,, Main Menu
-MAINMENU_TITLE,OpenVic
-MAINMENU_NEW_GAME,New Game
-MAINMENU_CONTINUE,Continue
-MAINMENU_MULTIPLAYER,Multiplayer
-MAINMENU_OPTIONS,Options
-MAINMENU_CREDITS,Credits
-MAINMENU_EXIT,Exit
-MAINMENU_CHECKSUM,Checksum {checksum}
-
-,, Options
-OPTIONS_RESET,R
-OPTIONS_BACK,X
-
-,, General Tab
-OPTIONS_GENERAL_SAVEFORMAT,Savegame Format
-OPTIONS_GENERAL_BINARY,Binary
-OPTIONS_GENERAL_TEXT,Text
-OPTIONS_GENERAL_AUTOSAVE,Autosave Interval
-OPTIONS_GENERAL_AUTOSAVE_MONTHLY,Monthly
-OPTIONS_GENERAL_AUTOSAVE_BIMONTHLY,Bi-Monthly
-OPTIONS_GENERAL_AUTOSAVE_YEARLY,Yearly
-OPTIONS_GENERAL_AUTOSAVE_BIYEARLY,Bi-Yearly
-OPTIONS_GENERAL_AUTOSAVE_NEVER,Never
-OPTIONS_GENERAL_LANGUAGE,Language
-
-,, Video Tab
-OPTIONS_VIDEO_RESOLUTION,Resolution
-OPTIONS_VIDEO_SCREEN_MODE,Screen Mode
-OPTIONS_VIDEO_FULLSCREEN,Fullscreen
-OPTIONS_VIDEO_BORDERLESS,Borderless
-OPTIONS_VIDEO_WINDOWED,Windowed
-OPTIONS_VIDEO_MONITOR_SELECTION,Monitor Selection
-OPTIONS_VIDEO_REFRESH_RATE,Refresh Rate
-OPTIONS_VIDEO_REFRESH_RATE_TOOLTIP,Only change from VSYNC if you are having issues with screen tearing.
-OPTIONS_VIDEO_QUALITY,Quality Preset
-OPTIONS_VIDEO_GUI_SCALE,Gui Scaling Factor
-OPTIONS_VIDEO_RESOLUTION_DIALOG_TITLE,Keep Resolution?
-OPTIONS_VIDEO_RESOLUTION_DIALOG_TEXT,Reverting resolution in ({time})
-
-,, Sound Tab
-MASTER_BUS,Master Volume
-MUSIC_BUS,Music Volume
-SFX_BUS,SFX Volume
-
-,, Credits Menu
-CREDITS_BACK,Back to Main Menu
-
-,, Game Lobby
-GAMELOBBY_START,Start Game
-GAMELOBBY_BACK,Back
-GAMELOBBY_SESSION_TAG,Session Tag
-GAMELOBBY_SELECT_ALL,All
-GAMELOBBY_DELETE_DIALOG_TITLE,Delete {file_name}
-GAMELOBBY_DELETE_DIALOG_TEXT,Are you sure you want to delete {file_name}?
-GAMELOBBY_SESSIONTAG_DIALOG_TITLE,Override {session_tag}
-GAMELOBBY_SESSIONTAG_DIALOG_TEXT,Are you want to override {session_tag} as a previous session?
-
-,, Game Session Menu
-GAMESESSIONMENU_SAVE,Save Game
-GAMESESSIONMENU_LOAD,Load Game
-GAMESESSIONMENU_OPTIONS,Options
-GAMESESSIONMENU_MAINMENU,Resign
-GAMESESSIONMENU_QUIT,Quit
-GAMESESSIONMENU_CLOSE,Close
-
-GAMESESSIONMENU_MAINMENU_DIALOG_TITLE,Resign Game
-GAMESESSIONMENU_MAINMENU_DIALOG_TEXT,Are you sure you want to resign and return to the main menu?
-GAMESESSIONMENU_QUIT_DIALOG_TITLE,Quit Game
-GAMESESSIONMENU_QUIT_DIALOG_TEXT,Are you sure you want to quit and return to desktop?
-
-,, Save Load Menu
-SAVELOADMENU_SAVE_TITLE,Save Menu
-SAVELOADMENU_LOAD_TITLE,Load Menu
-SAVELOADMENU_SAVE_BUTTON,Save
-SAVELOADMENU_LOAD_BUTTON,Load
-
-SAVELOADMENU_DELETE_DIALOG_TITLE,Delete {file_name}
-SAVELOADMENU_DELETE_DIALOG_TEXT,Are you sure you want to delete {file_name}?
-SAVELOADMENU_OVERWRITE_DIALOG_TITLE,Overwrite {file_name}
-SAVELOADMENU_OVERWRITE_DIALOG_TEXT,Are you want to overwrite {file_name}?
-
-SAVELOADMENU_SESSION,Session:
-
-SAVELOADMENU_TABSELECTIONTABBAR_ALL,All
-
-DIALOG_OK,OK
-DIALOG_CANCEL,Cancel
-DIALOG_SAVE_AND_RESIGN,Save and Resign
-DIALOG_SAVE_AND_QUIT,Save and Quit
-
-,, Province Overview Panel
-province_MISSING,No Province
-region_MISSING,No Region
-LIFE_RATING_TOOLTIP,Liferating: {life_rating}
-rgo_MISSING,No RGO
-building_MISSING,No Building
-building_fort,Fort
-building_naval_base,Naval Base
-building_railroad,Railroad
-EXPAND_PROVINCE_BUILDING,Expand
+;; Main Menu
+MAINMENU_TITLE;OpenVic
+MAINMENU_NEW_GAME;New Game
+MAINMENU_CONTINUE;Continue
+MAINMENU_MULTIPLAYER;Multiplayer
+MAINMENU_OPTIONS;Options
+MAINMENU_CREDITS;Credits
+MAINMENU_EXIT;Exit
+MAINMENU_CHECKSUM;Checksum {checksum}
+
+;; Options
+OPTIONS_RESET;R
+OPTIONS_BACK;X
+
+;; General Tab
+OPTIONS_GENERAL;General
+OPTIONS_GENERAL_SAVEFORMAT;Savegame Format
+OPTIONS_GENERAL_BINARY;Binary
+OPTIONS_GENERAL_TEXT;Text
+OPTIONS_GENERAL_AUTOSAVE;Autosave Interval
+OPTIONS_GENERAL_AUTOSAVE_MONTHLY;Monthly
+OPTIONS_GENERAL_AUTOSAVE_BIMONTHLY;Bi-Monthly
+OPTIONS_GENERAL_AUTOSAVE_YEARLY;Yearly
+OPTIONS_GENERAL_AUTOSAVE_BIYEARLY;Bi-Yearly
+OPTIONS_GENERAL_AUTOSAVE_NEVER;Never
+OPTIONS_GENERAL_LANGUAGE;Language
+
+;; Video Tab
+OPTIONS_VIDEO;Video
+
+OPTIONS_VIDEO_RESOLUTION;Resolution
+OPTIONS_VIDEO_RESOLUTION_DIMS;{width}x{height}
+OPTIONS_VIDEO_RESOLUTION_DIMS_DEFAULT;{width}x{height} (Default)
+OPTIONS_VIDEO_RESOLUTION_DIMS_NAMED;{width}x{height} ({name})
+OPTIONS_VIDEO_RESOLUTION_DIMS_NAMED_DEFAULT;{width}x{height} ({name}, Default)
+
+OPTIONS_VIDEO_RESOLUTION_3840x2160;4K
+OPTIONS_VIDEO_RESOLUTION_2560x1080;UW1080p
+OPTIONS_VIDEO_RESOLUTION_1920x1080;1080p
+OPTIONS_VIDEO_RESOLUTION_1280x720;720p
+
+OPTIONS_VIDEO_SCREEN_MODE;Screen Mode
+OPTIONS_VIDEO_FULLSCREEN;Fullscreen
+OPTIONS_VIDEO_BORDERLESS;Borderless
+OPTIONS_VIDEO_WINDOWED;Windowed
+
+OPTIONS_VIDEO_MONITOR_SELECTION;Monitor Selection
+OPTIONS_VIDEO_MONITOR;Monitor {index}
+
+OPTIONS_VIDEO_REFRESH_RATE;Refresh Rate
+OPTIONS_VIDEO_REFRESH_RATE_TOOLTIP;Only change from VSYNC if you are having issues with screen tearing.
+
+OPTIONS_VIDEO_QUALITY;Quality Preset
+OPTIONS_VIDEO_QUALITY_LOW;Low
+OPTIONS_VIDEO_QUALITY_MEDIUM;Medium
+OPTIONS_VIDEO_QUALITY_HIGH;High
+OPTIONS_VIDEO_QUALITY_ULTRA;Ultra
+OPTIONS_VIDEO_QUALITY_CUSTOM;Custom
+
+OPTIONS_VIDEO_GUI_SCALE;Gui Scaling Factor
+
+OPTIONS_VIDEO_REVERT_DIALOG_TITLE;Keep Video Changes?
+OPTIONS_VIDEO_REVERT_DIALOG_TEXT;Reverting changes in {time} seconds...
+
+;; Sound Tab
+OPTIONS_SOUND;Sound
+MASTER_BUS;Master Volume
+MUSIC_BUS;Music Volume
+SFX_BUS;SFX Volume
+OPTIONS_SOUND_EXPLODE_EARS;Explode Eardrums on Startup?
+
+OPTIONS_CONTROLS;Controls
+OPTIONS_OTHER;Other
+
+;; Credits Menu
+CREDITS_BACK;Back to Main Menu
+
+;; Game Lobby
+GAMELOBBY_START;Start Game
+GAMELOBBY_BACK;Back
+GAMELOBBY_SESSION_TAG;Session Tag
+GAMELOBBY_SELECT_ALL;All
+GAMELOBBY_DELETE_DIALOG_TITLE;Delete {file_name}
+GAMELOBBY_DELETE_DIALOG_TEXT;Are you sure you want to delete {file_name}?
+GAMELOBBY_SESSIONTAG_DIALOG_TITLE;Override {session_tag}
+GAMELOBBY_SESSIONTAG_DIALOG_TEXT;Are you want to override {session_tag} as a previous session?
+
+;; Game Session Menu
+GAMESESSIONMENU_SAVE;Save Game
+GAMESESSIONMENU_LOAD;Load Game
+GAMESESSIONMENU_OPTIONS;Options
+GAMESESSIONMENU_MAINMENU;Resign
+GAMESESSIONMENU_QUIT;Quit
+GAMESESSIONMENU_CLOSE;Close
+
+GAMESESSIONMENU_MAINMENU_DIALOG_TITLE;Resign Game
+GAMESESSIONMENU_MAINMENU_DIALOG_TEXT;Are you sure you want to resign and return to the main menu?
+GAMESESSIONMENU_QUIT_DIALOG_TITLE;Quit Game
+GAMESESSIONMENU_QUIT_DIALOG_TEXT;Are you sure you want to quit and return to desktop?
+
+;; Save Load Menu
+SAVELOADMENU_SAVE_TITLE;Save Menu
+SAVELOADMENU_LOAD_TITLE;Load Menu
+SAVELOADMENU_SAVE_BUTTON;Save
+SAVELOADMENU_LOAD_BUTTON;Load
+
+SAVELOADMENU_DELETE_DIALOG_TITLE;Delete {file_name}
+SAVELOADMENU_DELETE_DIALOG_TEXT;Are you sure you want to delete {file_name}?
+SAVELOADMENU_OVERWRITE_DIALOG_TITLE;Overwrite {file_name}
+SAVELOADMENU_OVERWRITE_DIALOG_TEXT;Are you want to overwrite {file_name}?
+
+SAVELOADMENU_SESSION;Session:
+
+SAVELOADMENU_TABSELECTIONTABBAR_ALL;All
+
+DIALOG_OK;OK
+DIALOG_CANCEL;Cancel
+DIALOG_SAVE_AND_RESIGN;Save and Resign
+DIALOG_SAVE_AND_QUIT;Save and Quit
+
+;; Province Overview Panel
+province_MISSING;No Province
+region_MISSING;No Region
+LIFE_RATING_TOOLTIP;Liferating: {life_rating}
+rgo_MISSING;No RGO
+building_MISSING;No Building
+building_fort;Fort
+building_naval_base;Naval Base
+building_railroad;Railroad
+EXPAND_PROVINCE_BUILDING;Expand
diff --git a/game/localisation/en_GB/provinces.csv b/game/localisation/en_GB/provinces.csv
index 80931c3..39cdae7 100644
--- a/game/localisation/en_GB/provinces.csv
+++ b/game/localisation/en_GB/provinces.csv
@@ -1,245 +1,245 @@
 
-,, Europe
-prov_britain,Britain
-prov_ireland,Ireland
-prov_iceland,Iceland
-prov_corsica,Corsica
-prov_sardinia,Sardinia
-prov_sicily,Sicily
-prov_malta,Malta
-prov_cyprus,Cyprus
-prov_greenland,Greenland
-prov_baleares,Balearic Islands
-prov_gotland,Gotland
-prov_crete,Crete
-prov_jan_mayen,Jan Mayen
-prov_faroes,Faroe Islands
-prov_mann,Isle of Mann
-prov_shetlands,Shetlands
-prov_orkney,Orkney
-prov_channel_islands,Channel Islands
-prov_madiera,Madiera
-prov_canarias,Canarias
-prov_sjaeland,Sjaeland
-prov_bornholm,Bornholm
-prov_bear_island,Bear Island
-prov_pantelleria,Pantelleria
-prov_iberia,Iberia
-prov_scandinavia,Scandinavia
-prov_jutland,Jutland
-prov_fyn,Fyn
-prov_hiiumaa,Hiiumaa
-prov_saaremaa,Saaremaa
-prov_italy,Italy
-prov_elba,Elba
-prov_france,France
-prov_netherlands,Netherlands
-prov_belgium,Belgium
-prov_luxembourg,Luxembourg
-prov_switzerland,Switzerland
-prov_balkans,Balkans
-prov_crimea,Crimea
-prov_germany,Germany
-prov_poland,Poland
-prov_baltics,Baltics
-prov_finland,Finland
-prov_aland,Åland
-prov_ukraine,Ukraine
-prov_russia,Russia
+;; Europe
+prov_britain;Britain
+prov_ireland;Ireland
+prov_iceland;Iceland
+prov_corsica;Corsica
+prov_sardinia;Sardinia
+prov_sicily;Sicily
+prov_malta;Malta
+prov_cyprus;Cyprus
+prov_greenland;Greenland
+prov_baleares;Balearic Islands
+prov_gotland;Gotland
+prov_crete;Crete
+prov_jan_mayen;Jan Mayen
+prov_faroes;Faroe Islands
+prov_mann;Isle of Mann
+prov_shetlands;Shetlands
+prov_orkney;Orkney
+prov_channel_islands;Channel Islands
+prov_madiera;Madiera
+prov_canarias;Canarias
+prov_sjaeland;Sjaeland
+prov_bornholm;Bornholm
+prov_bear_island;Bear Island
+prov_pantelleria;Pantelleria
+prov_iberia;Iberia
+prov_scandinavia;Scandinavia
+prov_jutland;Jutland
+prov_fyn;Fyn
+prov_hiiumaa;Hiiumaa
+prov_saaremaa;Saaremaa
+prov_italy;Italy
+prov_elba;Elba
+prov_france;France
+prov_netherlands;Netherlands
+prov_belgium;Belgium
+prov_luxembourg;Luxembourg
+prov_switzerland;Switzerland
+prov_balkans;Balkans
+prov_crimea;Crimea
+prov_germany;Germany
+prov_poland;Poland
+prov_baltics;Baltics
+prov_finland;Finland
+prov_aland;Åland
+prov_ukraine;Ukraine
+prov_russia;Russia
 
-,, North America
-prov_north_america,North America
-prov_cuba,Cuba
-prov_bermuda,Bermuda
-prov_jamaica,Jamaica
-prov_hispaniola,Hispaniola
-prov_aleutians,Aleutian Islands
-prov_bahamas,Bahamas
-prov_turks_and_caicos,Turks and Caicos
-prov_puerto_rico,Puerto Rico
-prov_barbados,Barbados
-prov_grenada,Grenada
-prov_st_vincent,St Vincent
-prov_st_lucia,St Lucia
-prov_martinique,Martinique
-prov_dominica,Dominica
-prov_guadeloupe,Guadeloupe
-prov_montserrat,Montserrat
-prov_antigua,Antigua
-prov_barbuda,Barbuda
-prov_st_kitts,St Kitts
-prov_west_virgin_islands,West Virgin Islands
-prov_east_virgin_islands,East Virgin Islands
-prov_cayman_islands,Cayman Islands
-prov_angulia,Angulia
-prov_central_america,Central America
-prov_mexico,Mexico
+;; North America
+prov_north_america;North America
+prov_cuba;Cuba
+prov_bermuda;Bermuda
+prov_jamaica;Jamaica
+prov_hispaniola;Hispaniola
+prov_aleutians;Aleutian Islands
+prov_bahamas;Bahamas
+prov_turks_and_caicos;Turks and Caicos
+prov_puerto_rico;Puerto Rico
+prov_barbados;Barbados
+prov_grenada;Grenada
+prov_st_vincent;St Vincent
+prov_st_lucia;St Lucia
+prov_martinique;Martinique
+prov_dominica;Dominica
+prov_guadeloupe;Guadeloupe
+prov_montserrat;Montserrat
+prov_antigua;Antigua
+prov_barbuda;Barbuda
+prov_st_kitts;St Kitts
+prov_west_virgin_islands;West Virgin Islands
+prov_east_virgin_islands;East Virgin Islands
+prov_cayman_islands;Cayman Islands
+prov_angulia;Angulia
+prov_central_america;Central America
+prov_mexico;Mexico
 
-,, Canada
-prov_victoria,Victoria
-prov_calgary,Calgary
-prov_saskatoon,Saskatoon
-prov_winnipeg,Winnipeg
-prov_ottawa,Ottawa
-prov_quebec,Quebec
-prov_new_brunswick,New Brunswick
-prov_prince_edward_island,Prince Edward Island
-prov_nova_scotia,Nova Scotia
-prov_labrador,Labrador
-prov_newfoundland,Newfoundland
-prov_whitehorse,Whitehorse
-prov_yellowknife,Yellowknife
-prov_iqaluit,Iqaluit
+;; Canada
+prov_victoria;Victoria
+prov_calgary;Calgary
+prov_saskatoon;Saskatoon
+prov_winnipeg;Winnipeg
+prov_ottawa;Ottawa
+prov_quebec;Quebec
+prov_new_brunswick;New Brunswick
+prov_prince_edward_island;Prince Edward Island
+prov_nova_scotia;Nova Scotia
+prov_labrador;Labrador
+prov_newfoundland;Newfoundland
+prov_whitehorse;Whitehorse
+prov_yellowknife;Yellowknife
+prov_iqaluit;Iqaluit
 
-,, South America
-prov_south_america,South America
-prov_galapagos,Galapagos
-prov_falklands,Falklands
-prov_south_georgia,South Georgia
+;; South America
+prov_south_america;South America
+prov_galapagos;Galapagos
+prov_falklands;Falklands
+prov_south_georgia;South Georgia
 
-,, Africa
-prov_africa,Africa
-prov_madagascar,Madagascar
-prov_socotra,Socotra
-prov_mauritius,Mauritius
-prov_reunion,Réunion
-prov_comoros,Comoros
-prov_sao_tome,Sao Tome
-prov_fernando_po,Fernando Po
-prov_cape_verde,Cape Verde
-prov_ascension,Ascension
-prov_st_helena,St Helena
-prov_tristan_da_cunha,Tristan da Cunha
-prov_seychelles,Seychelles
-prov_prince_edward_islands,Prince Edward Islands
-prov_kerguelen_islands,Kerguelen Islands
-prov_heard_island,Heard Island
-prov_egypt,Egypt
-prov_morocco,Morocco
+;; Africa
+prov_africa;Africa
+prov_madagascar;Madagascar
+prov_socotra;Socotra
+prov_mauritius;Mauritius
+prov_reunion;Réunion
+prov_comoros;Comoros
+prov_sao_tome;Sao Tome
+prov_fernando_po;Fernando Po
+prov_cape_verde;Cape Verde
+prov_ascension;Ascension
+prov_st_helena;St Helena
+prov_tristan_da_cunha;Tristan da Cunha
+prov_seychelles;Seychelles
+prov_prince_edward_islands;Prince Edward Islands
+prov_kerguelen_islands;Kerguelen Islands
+prov_heard_island;Heard Island
+prov_egypt;Egypt
+prov_morocco;Morocco
 
-,, Asia
-prov_middle_east,Middle East
-prov_ceylon,Ceylon
-prov_formosa,Formosa
-prov_sakhalin,Sakhalin
-prov_maldives,Maldives
-prov_hainan,Hainan
-prov_hokkaido,Hokkaido
-prov_diego_garcia,Diego Garcia
-prov_philippines,Philippines
-prov_india,India
-prov_andamans,Andaman Islands
-prov_nicobar_islands,Nicobar Islands
-prov_indochina,Indochina
-prov_korea,Korea
-prov_okinawa,Okinawa
-prov_yaeyama,Yaeyama
-prov_kyushu,Kyushu
-prov_shikoku,Shikoku
-prov_japan,Japan
-prov_kurils,Kuril Islands
-prov_manchuria,Manchuria
-prov_china,China
-prov_central_asia,Central Asia
-prov_siberia,Siberia
-prov_iran,Iran
-prov_anatolia,Anatolia
+;; Asia
+prov_middle_east;Middle East
+prov_ceylon;Ceylon
+prov_formosa;Formosa
+prov_sakhalin;Sakhalin
+prov_maldives;Maldives
+prov_hainan;Hainan
+prov_hokkaido;Hokkaido
+prov_diego_garcia;Diego Garcia
+prov_philippines;Philippines
+prov_india;India
+prov_andamans;Andaman Islands
+prov_nicobar_islands;Nicobar Islands
+prov_indochina;Indochina
+prov_korea;Korea
+prov_okinawa;Okinawa
+prov_yaeyama;Yaeyama
+prov_kyushu;Kyushu
+prov_shikoku;Shikoku
+prov_japan;Japan
+prov_kurils;Kuril Islands
+prov_manchuria;Manchuria
+prov_china;China
+prov_central_asia;Central Asia
+prov_siberia;Siberia
+prov_iran;Iran
+prov_anatolia;Anatolia
 
-,, Oceania
-prov_oceania,Oceania
-prov_indonesia,Indonesia
-prov_north_island,North Island
-prov_south_island,South Island
-prov_tasmania,Tasmania
-prov_australia,Australia
-prov_hawaii,Hawaii
+;; Oceania
+prov_oceania;Oceania
+prov_indonesia;Indonesia
+prov_north_island;North Island
+prov_south_island;South Island
+prov_tasmania;Tasmania
+prov_australia;Australia
+prov_hawaii;Hawaii
 
-,, Lakes
-prov_aral_sea,Aral Sea
-prov_caspian_sea,Caspian Sea
-prov_lake_ladoga,Lake Ladoga
-prov_lake_ontario,Lake Ontario
-prov_lake_erie,Lake Erie
-prov_lake_huron,Lake Huron
-prov_lake_michigan,Lake Michigan
-prov_lake_superior,Lake Superior
-prov_lake_baikal,Lake Baikal
-prov_lake_woods,Lake of the Woods
-prov_lake_manitoba,Lake Manitoba
-prov_reindeer_lake,Reindeer Lake
-prov_lake_ronge,Lac la Ronge
-prov_lake_athabasca,Lake Athabasca
-prov_great_slave_lake,Great Slave Lake
-prov_great_bear_lake,Great Bear Lake
+;; Lakes
+prov_aral_sea;Aral Sea
+prov_caspian_sea;Caspian Sea
+prov_lake_ladoga;Lake Ladoga
+prov_lake_ontario;Lake Ontario
+prov_lake_erie;Lake Erie
+prov_lake_huron;Lake Huron
+prov_lake_michigan;Lake Michigan
+prov_lake_superior;Lake Superior
+prov_lake_baikal;Lake Baikal
+prov_lake_woods;Lake of the Woods
+prov_lake_manitoba;Lake Manitoba
+prov_reindeer_lake;Reindeer Lake
+prov_lake_ronge;Lac la Ronge
+prov_lake_athabasca;Lake Athabasca
+prov_great_slave_lake;Great Slave Lake
+prov_great_bear_lake;Great Bear Lake
 
-,, Seas and Oceans
-prov_azov_sea,Sea of Azov
-prov_black_sea,Black Sea
-prov_marmara_sea,Sea of Marmara
-prov_agean_sea,Agean Sea
-prov_ionian_sea,Ionian Sea
-prov_adriatic_sea,Adriatic Sea
-prov_tyrrhenian_sea,Tyrrhenian Sea
-prov_east_mediterranean,East Mediterranean Sea
-prov_central_mediterranean,Central Mediterranean Sea
-prov_west_mediterranean,West Mediterranean Sea
-prov_ligurian_sea,Ligurian Sea
-prov_balearic_sea,Balearic Sea
-prov_alboran_sea,Alboran Sea
-prov_gulf_bothnia,Gulf of Bothnia
-prov_gulf_finland,Gulf of Finland
-prov_gulf_riga,Gulf of Riga
-prov_baltic_sea,Baltic Sea
-prov_danish_straits,Danish Straits
-prov_english_channel,English Channel
-prov_irish_sea,Irish Sea
-prov_biscay_bay,Bay of Biscay
-prov_north_sea,North Sea
-prov_red_sea,Red Sea
-prov_arabian_sea,Arabian Sea
-prov_persian_gulf,Persian Gulf
-prov_andaman_sea,Andaman Sea
-prov_bay_bengal,Bay of Bengal
-prov_okhotsk_sea,Sea of Okhotsk
-prov_japan_sea,Sea of Japan
-prov_east_china_sea,East China Sea
-prov_south_china_sea,South China Sea
-prov_philippine_sea,Philippine Sea
-prov_celebes_sea,Celebes Sea
-prov_java_sea,Java Sea
-prov_banda_sea,Banda Sea
-prov_arafura_sea,Arafura Sea
-prov_gulf_mexico,Gulf of Mexico
-prov_caribbean_sea,Caribbean Sea
-prov_mozambique_channel,Mozambique Channel
-prov_zanj_sea,Sea of Zanj
-prov_kara_sea,Kara Sea
-prov_barents_sea,Barents Sea
-prov_norwegian_sea,Norwegian Sea
-prov_greenland_sea,Greenland Sea
-prov_labrador_sea,Labrador Sea
-prov_hudson_bay,Hudson Bay
-prov_gulf_st_lawrence,Gulf of St Lawrence
-prov_gulf_alaska,Gulf of Alaska
-prov_gulf_california,Gulf of California
-prov_east_siberian_sea,East Siberian Sea
-prov_sargasso_sea,Sargasso Sea
-prov_gulf_guinea,Gulf of Guinea
-prov_celtic_sea,Celtic Sea
-prov_argentine_sea,Argentine Sea
-prov_chilean_sea,Chilean Sea
-prov_north_atlantic,North Atlantic Ocean
-prov_central_atlantic,Central Atlantic Ocean
-prov_south_atlantic,South Atlantic Ocean
-prov_indian_ocean,Indian Ocean
-prov_great_australian_bight,Great Australian Bight
-prov_tasman_sea,Tasman Sea
-prov_coral_sea,Coral Sea
-prov_melanesia,Melanesia
-prov_micronesia,Micronesia
-prov_polynesia,Polynesia
-prov_north_pacific,North Pacific Ocean
-prov_south_pacific,South Pacific Ocean
-prov_bering_sea,Bering Sea
-prov_chukchi_sea,Chukchi Sea
-prov_beaufort_sea,Beaufort Sea
+;; Seas and Oceans
+prov_azov_sea;Sea of Azov
+prov_black_sea;Black Sea
+prov_marmara_sea;Sea of Marmara
+prov_agean_sea;Agean Sea
+prov_ionian_sea;Ionian Sea
+prov_adriatic_sea;Adriatic Sea
+prov_tyrrhenian_sea;Tyrrhenian Sea
+prov_east_mediterranean;East Mediterranean Sea
+prov_central_mediterranean;Central Mediterranean Sea
+prov_west_mediterranean;West Mediterranean Sea
+prov_ligurian_sea;Ligurian Sea
+prov_balearic_sea;Balearic Sea
+prov_alboran_sea;Alboran Sea
+prov_gulf_bothnia;Gulf of Bothnia
+prov_gulf_finland;Gulf of Finland
+prov_gulf_riga;Gulf of Riga
+prov_baltic_sea;Baltic Sea
+prov_danish_straits;Danish Straits
+prov_english_channel;English Channel
+prov_irish_sea;Irish Sea
+prov_biscay_bay;Bay of Biscay
+prov_north_sea;North Sea
+prov_red_sea;Red Sea
+prov_arabian_sea;Arabian Sea
+prov_persian_gulf;Persian Gulf
+prov_andaman_sea;Andaman Sea
+prov_bay_bengal;Bay of Bengal
+prov_okhotsk_sea;Sea of Okhotsk
+prov_japan_sea;Sea of Japan
+prov_east_china_sea;East China Sea
+prov_south_china_sea;South China Sea
+prov_philippine_sea;Philippine Sea
+prov_celebes_sea;Celebes Sea
+prov_java_sea;Java Sea
+prov_banda_sea;Banda Sea
+prov_arafura_sea;Arafura Sea
+prov_gulf_mexico;Gulf of Mexico
+prov_caribbean_sea;Caribbean Sea
+prov_mozambique_channel;Mozambique Channel
+prov_zanj_sea;Sea of Zanj
+prov_kara_sea;Kara Sea
+prov_barents_sea;Barents Sea
+prov_norwegian_sea;Norwegian Sea
+prov_greenland_sea;Greenland Sea
+prov_labrador_sea;Labrador Sea
+prov_hudson_bay;Hudson Bay
+prov_gulf_st_lawrence;Gulf of St Lawrence
+prov_gulf_alaska;Gulf of Alaska
+prov_gulf_california;Gulf of California
+prov_east_siberian_sea;East Siberian Sea
+prov_sargasso_sea;Sargasso Sea
+prov_gulf_guinea;Gulf of Guinea
+prov_celtic_sea;Celtic Sea
+prov_argentine_sea;Argentine Sea
+prov_chilean_sea;Chilean Sea
+prov_north_atlantic;North Atlantic Ocean
+prov_central_atlantic;Central Atlantic Ocean
+prov_south_atlantic;South Atlantic Ocean
+prov_indian_ocean;Indian Ocean
+prov_great_australian_bight;Great Australian Bight
+prov_tasman_sea;Tasman Sea
+prov_coral_sea;Coral Sea
+prov_melanesia;Melanesia
+prov_micronesia;Micronesia
+prov_polynesia;Polynesia
+prov_north_pacific;North Pacific Ocean
+prov_south_pacific;South Pacific Ocean
+prov_bering_sea;Bering Sea
+prov_chukchi_sea;Chukchi Sea
+prov_beaufort_sea;Beaufort Sea
diff --git a/game/localisation/en_GB/regions.csv b/game/localisation/en_GB/regions.csv
index 258cce6..70abd1c 100644
--- a/game/localisation/en_GB/regions.csv
+++ b/game/localisation/en_GB/regions.csv
@@ -1,8 +1,8 @@
 
-,, Regions
-region_europe,Europe
-region_north_america,North America
-region_south_america,South America
-region_africa,Africa
-region_asia,Asia
-region_oceania,Oceania
+;; Regions
+region_europe;Europe
+region_north_america;North America
+region_south_america;South America
+region_africa;Africa
+region_asia;Asia
+region_oceania;Oceania